Browse Source

build installer-stable now passes --upload aswell for automatic uploading of releases

--upload now works in git checkouts
tags/0.6.3m2a1
Shane Mc Cormack 15 years ago
parent
commit
83f143ad58
2 changed files with 5 additions and 2 deletions
  1. 3
    0
      build-installer.xml
  2. 2
    2
      installer/release.sh

+ 3
- 0
build-installer.xml View File

18
         <echo message=""/>
18
         <echo message=""/>
19
     </target>
19
     </target>
20
 
20
 
21
+
21
     <target name="-installer-build-stable" if="has.bash">
22
     <target name="-installer-build-stable" if="has.bash">
22
         <exec executable="/bin/bash" dir="installer" resultproperty="installer.result">
23
         <exec executable="/bin/bash" dir="installer" resultproperty="installer.result">
23
             <arg value="release.sh"/>
24
             <arg value="release.sh"/>
24
             <arg value="-t"/>
25
             <arg value="-t"/>
25
             <arg value="-c"/>
26
             <arg value="-c"/>
27
+            <arg value="STABLE"/>
28
+            <arg value="--upload"/>
26
         </exec>
29
         </exec>
27
 
30
 
28
         <condition property="installer.success">
31
         <condition property="installer.success">

+ 2
- 2
installer/release.sh View File

310
 	${SVN} revert ${updatedir}/*
310
 	${SVN} revert ${updatedir}/*
311
 done;
311
 done;
312
 
312
 
313
-if [ "1" = "${UPLOAD}" -a "1" = "${TAG}" ]; then
313
+if [ "1" = "${UPLOAD}" -a "" != "${TAGGED}" ]; then
314
 	echo "================================================================"
314
 	echo "================================================================"
315
 	echo "Uploading to GoogleCode"
315
 	echo "Uploading to GoogleCode"
316
 	echo "================================================================"
316
 	echo "================================================================"
318
 	cd gcode
318
 	cd gcode
319
 	sh uploads_release.sh -v ${VERSION}
319
 	sh uploads_release.sh -v ${VERSION}
320
 else
320
 else
321
-	echo "Not uploading to GoogleCode"
321
+	echo "Not uploading to GoogleCode (Only tagged releases can be uploaded)"
322
 fi;
322
 fi;
323
 
323
 
324
 echo "================================================================"
324
 echo "================================================================"

Loading…
Cancel
Save