Merge pull request #606 from cocojoe/develop-v3

Installer Updates

Former-commit-id: f4fb6df

Author: slembcke

install.sh

@@ -13,7 +13,7 @@
 # Variables setup
 # ----------------------------------------------------
 SCRIPT_VER="v0.9.5"
-COCOS2D_VER="Cocos2D-v3.0.0.rc"
+COCOS2D_VER="Cocos2D-v3.0.0.RC.2"
 COCOS2D_DST_DIR="cocos2d v3.x"
 SCRIPT_DIR="$(dirname $0)"
 
@@ -351,4 +351,4 @@ if $INSTALL ; then
 	echo ""
 
 	rm -rf "${LOG_PATH}" 1>/dev/null 2>/dev/null
-fi
+fi

installer/build_installer.sh

@@ -32,4 +32,4 @@ echo "${BOLD}>>> Build Complete. ${COLOREND}"
 du -h -d=1 "$INSTALL_TARGET_APP"
 
 #Clean Up
-rm -f $INSTALL_FILE_TARGET
+rm -f $INSTALL_FILE_TARGET

installer/install.platypus

@@ -39,7 +39,7 @@
 	<key>InterpreterArgs</key>
 	<array/>
 	<key>Name</key>
-	<string>Cocos2D Installer 3.0</string>
+	<string>Cocos2D Installer 3.0.0.RC.2</string>
 	<key>NibPath</key>
 	<string>/usr/local/share/platypus/MainMenu.nib</string>
 	<key>OptimizeApplication</key>
@@ -84,6 +84,6 @@
 	<key>UseXMLPlistFormat</key>
 	<true/>
 	<key>Version</key>
-	<string>3.0</string>
+	<string>3.0.0.RC2</string>
 </dict>
 </plist>

installer/install.sh

@@ -2,7 +2,7 @@
 # ----------------------------------------------------
 # Variables setup
 # ----------------------------------------------------
-COCOS2D_VER="Cocos2D-v3.0"
+COCOS2D_VER="Cocos2D-v3.0.0.RC.2"
 TARGET_DIR="$HOME/Downloads/${COCOS2D_VER}"
 INSTALL_FILE=install.tar.gz
 
@@ -33,4 +33,4 @@ echo "${BOLD}>>> ${COCOS2D_VER} installation complete! ${COLOREND}"
 rm -fr $TARGET_DIR
 
 # Landing Page, @todo Needs a nice welcome page
-open http://www.cocos2d-iphone.org/forums/
+open http://www.cocos2d-iphone.org/forums/

tools/appledoc.REMOVED.git-id

@@ -1 +1 @@
-596563b3f861c831ede222d8b5774ff5d43782cc
+460bb432e36338fdd687c3815495a387cf3efe28

tools/build_docs.sh

@@ -8,7 +8,7 @@ outputPath="api-docs";
 # End constants
 tools/appledoc \
 --project-name "Cocos2D Developer Library" \
---project-company "3.X" \
+--project-company "3.0.0.RC.2" \
 --company-id "org.cocos2d" \
 --docset-atom-filename "testpath4.atom" \
 --docset-feed-url "${companyURL}/${company}/%DOCSETATOMFILENAME" \