|
@@ -9,6 +9,9 @@ plugins_windows=""
|
9
|
9
|
# Additional Jar names of plugins to add to only linux installers. (* means all)
|
10
|
10
|
plugins_linux=""
|
11
|
11
|
|
|
12
|
+# Additional Jar names of plugins to add to only osx installers. (* means all)
|
|
13
|
+plugins_osx=""
|
|
14
|
+
|
12
|
15
|
showHelp() {
|
13
|
16
|
echo "This will generate the different DMDirc installers."
|
14
|
17
|
echo "Usage: ${0} [params] <release>"
|
|
@@ -22,7 +25,8 @@ showHelp() {
|
22
|
25
|
echo " --jre64 Include a 64bit jre in the installers."
|
23
|
26
|
echo "-p, --plugins <plugins> Plugins to add to all the jars."
|
24
|
27
|
echo "-pl, --plugins-linux <plugins> Plugins to linux installer."
|
25
|
|
- echo "-pw, --plugins-windows <plugins> Plugins to linux installer."
|
|
28
|
+ echo "-pw, --plugins-windows <plugins> Plugins to windows installer."
|
|
29
|
+ echo "-po --plugins-osx <plugins> Plugins to osx installer."
|
26
|
30
|
echo "-h, --help Help information"
|
27
|
31
|
echo "-o, --opt <options> Additional options to pass to the make*Installer.sh files"
|
28
|
32
|
echo "---------------------"
|
|
@@ -63,6 +67,10 @@ while test -n "$1"; do
|
63
|
67
|
shift
|
64
|
68
|
plugins_windows="${1}"
|
65
|
69
|
;;
|
|
70
|
+ --plugins-osx|-po)
|
|
71
|
+ shift
|
|
72
|
+ plugins_osx="${1}"
|
|
73
|
+ ;;
|
66
|
74
|
--opt|-o)
|
67
|
75
|
shift
|
68
|
76
|
OPT="${1} "
|
|
@@ -77,7 +85,7 @@ while test -n "$1"; do
|
77
|
85
|
shift
|
78
|
86
|
done
|
79
|
87
|
|
80
|
|
-if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*" ]; then
|
|
88
|
+if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*" -o "${plugins_osx}" = "*" ]; then
|
81
|
89
|
echo "Something is all.";
|
82
|
90
|
allPlugins=""
|
83
|
91
|
for thisfile in `ls -1 ../plugins/*.jar`; do
|
|
@@ -86,6 +94,7 @@ if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*
|
86
|
94
|
if [ "${plugins}" = "*" ]; then plugins=${allPlugins}; fi
|
87
|
95
|
if [ "${plugins_linux}" = "*" ]; then plugins_linux=${allPlugins}; fi
|
88
|
96
|
if [ "${plugins_windows}" = "*" ]; then plugins_windows=${allPlugins}; fi
|
|
97
|
+ if [ "${plugins_osx}" = "*" ]; then plugins_osx=${allPlugins}; fi
|
89
|
98
|
fi;
|
90
|
99
|
|
91
|
100
|
if [ "${LAST}" != "" ]; then
|
|
@@ -250,6 +259,13 @@ cd windows
|
250
|
259
|
./makeInstallerWindows.sh ${OPT}${JARFILE}${JRE}-k -s ${BRANCH}${RELEASE} -p "${plugins_windows}"
|
251
|
260
|
cd ${THISDIR}
|
252
|
261
|
|
|
262
|
+echo "================================================================"
|
|
263
|
+echo "Building OSX Bundle"
|
|
264
|
+echo "================================================================"
|
|
265
|
+cd osx
|
|
266
|
+./makeInstallerOSX.sh ${OPT}${JARFILE}-k -s ${BRANCH}${RELEASE} -p "${plugins_osx}"
|
|
267
|
+cd ${THISDIR}
|
|
268
|
+
|
253
|
269
|
|
254
|
270
|
#MD5BIN=`which md5sum`
|
255
|
271
|
#if [ "${MD5BIN}" != "" ]; then
|