Merge pull request #129 from GsDevKit/dev

Fix for Issues #126 and #127
GsDevKit · Jun 15, 2016 · 2f17276 · 2f17276
2 parents c6fe23c + 9d56801
commit 2f17276
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/bin/attachForeignStone b/bin/attachForeignStone
@@ -35,7 +35,7 @@ HELP
 }
 
 PLATFORM="`uname -sm | tr ' ' '-'`"
-if [[ "$PLATFORM" == MINGW32_NT* || "$PLATFORM" == MSYS_NT* ]] ; then
+if [[ "$PLATFORM" == MINGW32_NT* || "$PLATFORM" == MSYS_NT* || "$PLATFORM" == MINGW64_NT* ]] ; then
   exit_1_banner "This script is a server-only script and cannot be used on Windows"
 fi
 

diff --git a/bin/devKitCommandLine b/bin/devKitCommandLine
@@ -82,7 +82,7 @@ fi
 PLATFORM="`uname -sm | tr ' ' '-'`"
 
 case "$PLATFORM" in
-  MSYS_NT*|MINGW32_NT*) 
+  MSYS_NT*|MINGW32_NT*|MINGW64_NT*) 
     vmArgs="--headless"
     if [ "$interactive" = "true" ] ; then
       vmArgs=""

diff --git a/bin/downloadGemStone b/bin/downloadGemStone
@@ -67,7 +67,7 @@ case "$PLATFORM" in
       # Linux looks OK
       gsvers="GemStone64Bit${vers}-x86_64.Linux"
       ;;
-    MSYS_NT*|MINGW32_NT*)
+    MSYS_NT*|MINGW32_NT*|MINGW64_NT*)
       if  [ "$vers" \< "3.3.0"  ] ;  then 
           gsvers="GemBuilderC${vers}-x86.Windows_NT"
       else
@@ -135,7 +135,7 @@ popd >& /dev/null
 
 
 case "$PLATFORM" in
-  MSYS_NT*|MINGW32_NT*) #do nothing
+  MSYS_NT*|MINGW32_NT*|MINGW64_NT*) #do nothing
     ;;
   *)
     # Copy initial system.conf into the Seaside data directory

diff --git a/bin/private/installGci b/bin/private/installGci
@@ -69,7 +69,7 @@ case "$PLATFORM" in
 		gsvers="GemStone64Bit${vers}-x86_64.Linux"; libext="so" ;;
   Darwin-i386) 
 		gsvers="GemStone64Bit${vers}-i386.Darwin"; libext="dylib" ;;
-  MSYS_NT*|MINGW32_NT*) 	
+  MSYS_NT*|MINGW32_NT*|MINGW64_NT*) 	
 	if  [ "$vers" \< "3.3.0"  ] ;  then 
 			 gsvers="GemBuilderC${vers}-x86.Windows_NT"
 		else
@@ -87,7 +87,7 @@ case "$clientType" in
     case "$PLATFORM" in
       Linux-x86_64) targetLocation="${directoryPath}/pharo-vm" ;;
       Darwin-i386) targetLocation="${directoryPath}/pharo-vm/Pharo.app/Contents/MacOS/Plugins" ;;
-      MSYS_NT*|MINGW32_NT*)
+      MSYS_NT*|MINGW32_NT*|MINGW64_NT*)
         case "$vers" in
           2.4.*|3.0.*|3.1.*) sourceLocation="${gs_product}/bin" ;;
           *) sourceLocation="${gs_product}/bin32" ;;

diff --git a/bin/utils/installOsPrereqs b/bin/utils/installOsPrereqs
@@ -159,7 +159,7 @@ else
     Linux-x86_64)
       # Linux looks OK
       ;;
-    MSYS_NT*|MINGW32_NT*)
+    MSYS_NT*|MINGW32_NT*|MINGW64_NT*)
       # If we are running a bash script on windows, then we are done
       echo "No os prereqs installed for windows"
       exit_0_banner "...finished"

diff --git a/shared/bin/defGsDevKit.env b/shared/bin/defGsDevKit.env
@@ -15,7 +15,7 @@ if [ -e "${GS_SYS_LOCAL}/gsdevkit_bin/defSharedGitDevKit.env" ] ; then
   source "${GS_SYS_LOCAL}/gsdevkit_bin/defSharedGitDevKit.env"
 fi
 PLATFORM="`uname -sm | tr ' ' '-'`"
-if [[ "$PLATFORM" == MINGW32_NT* || "$PLATFORM" == MSYS_NT* ]] ; then
+if [[ "$PLATFORM" == MINGW32_NT* || "$PLATFORM" == MSYS_NT* || "$PLATFORM" == MINGW64_NT* ]] ; then
   source "${GS_SYS_DEFAULT}/gsdevkit_bin/defSharedGitDevKit_win.env"
   if [ -e "${GS_SYS_LOCAL}/gsdevkit_bin/defSharedGitDevKit_win.env" ] ; then
     source "${GS_SYS_LOCAL}/gsdevkit_bin/defSharedGitDevKit_win.env"

diff --git a/sys/default/server/home/utils/upgrade.ston b/sys/default/server/home/utils/upgrade.ston
@@ -1,7 +1,7 @@
 TDRawGatewayNode{#name:'upgrade',#contents:'(TDComposedDirectoryNode
     pathComposedDirectoryNodeNamed: \'upgrade\'
     topez: self topez)
-"    addPathNode: \'/sys/stone/upgrade\';" "uncomment (and use a recent version of tODE in all stoness, if you need to have stone-specific upgrade scripts"
+    addPathNode: \'/sys/stone/upgrade\';
     addPathNode: \'/sys/local/server/upgrade\';
     addPathNode: \'/sys/default/server/upgrade\';
     yourself'}