Mark Sibly 9 лет назад
Родитель
Сommit
85377cb317

BIN
bin/mx2cc_linux


BIN
bin/mx2cc_macos


BIN
bin/mx2cc_windows.exe


+ 1 - 1
devtools/.gitignore

@@ -1 +1 @@
-!.gitignore
+!.gitignore

+ 9 - 0
scripts/common.bat

@@ -0,0 +1,9 @@
+
+set mx2cc=..\bin\mx2cc_windows.exe
+set mx2cc_new=..\src\mx2new\mx2cc.buildv011\desktop_release_windows\mx2cc.exe
+
+set ted2=..\bin\ted2_windows
+set ted2_new=..\src\ted2\ted2.buildv011\desktop_release_windows
+
+set launcher="..\Monkey2 (Windows).exe"
+set launcher_new=..\src\launcher\launcher.buildv011\desktop_release_windows\launcher.exe

+ 6 - 6
scripts/common.sh

@@ -10,22 +10,22 @@ if [ "$OSTYPE" = "linux-gnu" ]
 then
 
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="../src/mx2new/mx2cc.buildv010/desktop_release_linux/mx2cc"
+	mx2cc_new="../src/mx2new/mx2cc.buildv011/desktop_release_linux/mx2cc"
 	
 	ted2="../bin/ted2_linux"
-	ted2_new="../src/ted2/ted2.buildv010/desktop_release_linux"
+	ted2_new="../src/ted2/ted2.buildv011/desktop_release_linux"
 	
 	launcher="../Monkey2 (Linux)"
-	launcher_new="../src/launcher/launcher.buildv010/desktop_release_linux/launcher"
+	launcher_new="../src/launcher/launcher.buildv011/desktop_release_linux/launcher"
 	
 else
 
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="../src/mx2new/mx2cc.buildv010/desktop_release_macos/mx2cc"
+	mx2cc_new="../src/mx2new/mx2cc.buildv011/desktop_release_macos/mx2cc"
 	
 	ted2="../bin/ted2_macos.app"
-	ted2_new="../src/ted2/ted2.buildv010/desktop_release_macos/ted2.app"
+	ted2_new="../src/ted2/ted2.buildv011/desktop_release_macos/ted2.app"
 	
 	launcher="../Monkey2 (Macos).app"
-	launcher_new="../src/launcher/launcher.buildv010/desktop_release_macos/launcher.app"
+	launcher_new="../src/launcher/launcher.buildv011/desktop_release_macos/launcher.app"
 fi

+ 4 - 2
scripts/rebuildmx2cc.bat

@@ -1,9 +1,11 @@
 
 echo off
 
+call common.bat
+
 echo.
 echo ***** Rebuilding mx2cc *****
 echo.
 
-..\bin\mx2cc_windows makeapp -clean -apptype=console -config=release ../src/mx2new/mx2cc.monkey2
-copy ..\src\mx2new\mx2cc.buildv010\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+%mx2cc% makeapp -clean -apptype=console -config=release ../src/mx2new/mx2cc.monkey2
+copy %mx2cc_new% %mx2cc%

+ 6 - 4
scripts/rebuildted2.bat

@@ -1,12 +1,14 @@
 
 echo off
 
+call common.bat
+
 echo.
 echo ***** Rebuilding ted2 *****
 echo.
 
-..\bin\mx2cc_windows makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/ted2/ted2.monkey2
-xcopy ..\src\ted2\ted2.buildv010\desktop_release_windows ..\bin\ted2_windows /I /S /Y
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
+xcopy %ted2_new% %ted2% /I /S /Y
 
-..\bin\mx2cc_windows makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/launcher/launcher.monkey2
-copy ..\src\launcher\launcher.buildv010\desktop_release_windows\launcher.exe "..\Monkey2 (Windows).exe"
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+copy %launcher_new% %launcher%

+ 4 - 2
scripts/updatemx2cc.bat

@@ -1,9 +1,11 @@
 
 echo off
 
+call common.bat
+
 echo.
 echo ***** Updating mx2cc *****
 echo.
 
-..\bin\mx2cc_windows makeapp -apptype=console -config=release ../src/mx2new/mx2cc.monkey2
-copy ..\src\mx2new\mx2cc.buildv010\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+%mx2cc% makeapp -apptype=console -config=release ../src/mx2new/mx2cc.monkey2
+copy %mx2cc_new% %mx2cc%

+ 6 - 4
scripts/updateted2.bat

@@ -1,12 +1,14 @@
 
 echo off
 
+call common.bat
+
 echo.
 echo ***** Updating ted2 *****
 echo.
 
-..\bin\mx2cc_windows makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
-xcopy ..\src\ted2\ted2.buildv010\desktop_release_windows ..\bin\ted2_windows /I /S /Y
+%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
+xcopy %ted2_new% %ted2% /I /S /Y
 
-..\bin\mx2cc_windows makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
-copy ..\src\launcher\launcher.buildv010\desktop_release_windows\launcher.exe "..\Monkey2 (Windows).exe"
+%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+copy %launcher_new% %launcher%

+ 2 - 2
src/mx2new/mx2.monkey2

@@ -45,7 +45,7 @@ Using lib.c
 '
 ' 1) Update MX2CC_VERSION below
 ' 2) ./updatemx2cc
-' 3) edit .sh and .bat files to use new version (common.sh, updatemx2cc.bat, rebuildmx2cc.bat)
+' 3) edit .sh and .bat files to use new version (common.sh, common.bat)
 ' 4) ./rebuildall
 '
-Const MX2CC_VERSION:="010"
+Const MX2CC_VERSION:="011"