瀏覽代碼

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 年之前
父節點
當前提交
83f143ad58
共有 2 個檔案被更改,包括 5 行新增2 行删除
  1. 3
    0
      build-installer.xml
  2. 2
    2
      installer/release.sh

+ 3
- 0
build-installer.xml 查看文件

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

+ 2
- 2
installer/release.sh 查看文件

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

Loading…
取消
儲存