Parcourir la source

Linux installer now creates meanigfully-named temp dirs (adds DMDirc. prefix)

    - This might make it run on BSD/Solaris based systems, not tested
Added Start of OSX "Installer" (issue 421)
    - App Bundle is created and works, next step is .dmg file (then all done \o)
Reorganise osx icons into separate resource dir


git-svn-id: http://svn.dmdirc.com/trunk@3526 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack il y a 16 ans
Parent
révision
be35d60216

+ 1
- 1
installer/linux/makeInstallerLinux.sh Voir le fichier

398
 	MKTEMP=`which mktemp`
398
 	MKTEMP=`which mktemp`
399
 	if [ "" != "${MKTEMP}" ]; then
399
 	if [ "" != "${MKTEMP}" ]; then
400
 		# mktemp exists \o
400
 		# mktemp exists \o
401
-		DIR=`${MKTEMP} -d`
401
+		DIR=`${MKTEMP} -d /tmp/DMDirc.XXXXXX`
402
 		eval "$1=${DIR}"
402
 		eval "$1=${DIR}"
403
 		return;
403
 		return;
404
 	fi
404
 	fi

+ 18
- 2
installer/release.sh Voir le fichier

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

BIN
src/com/dmdirc/res/osx/DMDircVolumeIcon.png Voir le fichier


BIN
src/com/dmdirc/res/osx/VolumeIcon.icns Voir le fichier


BIN
src/com/dmdirc/res/osx/VolumeIcon.png Voir le fichier


src/com/dmdirc/res/osxlogo.icns → src/com/dmdirc/res/osx/dmdirc.icns Voir le fichier


BIN
src/com/dmdirc/res/osx/logo128.png Voir le fichier


BIN
src/com/dmdirc/res/osx/logo16.png Voir le fichier


BIN
src/com/dmdirc/res/osx/logo256.png Voir le fichier


BIN
src/com/dmdirc/res/osx/logo32.png Voir le fichier


BIN
src/com/dmdirc/res/osx/logo512.png Voir le fichier


Chargement…
Annuler
Enregistrer