Mark Sibly 8 年之前
父节点
当前提交
7d37b7547e
共有 5 个文件被更改,包括 28 次插入23 次删除
  1. 1 1
      scripts/rebuildmx2cc.sh
  2. 7 6
      scripts/rebuildted2go.sh
  3. 4 2
      scripts/updatemx2cc.sh
  4. 10 9
      scripts/updateted2.sh
  5. 6 5
      scripts/updateted2go.sh

+ 1 - 1
scripts/rebuildmx2cc.sh

@@ -11,4 +11,4 @@ $mx2cc makemods -clean -config=release monkey libc miniz stb-image stb-image-wri
 
 $mx2cc makeapp -clean -apptype=console -config=release -product=scripts/mx2cc.products/mx2cc_$host ../src/mx2cc/mx2cc.monkey2
 
-copy mx2cc.products/mx2cc_$host $mx2cc
+cp mx2cc.products/mx2cc_$host $mx2cc

+ 7 - 6
scripts/rebuildted2go.sh

@@ -5,9 +5,9 @@ echo ""
 echo "***** Rebuilding ted2 *****"
 echo ""
 
-$mx2cc makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/ted2go/Ted2.monkey2
+$mx2cc makeapp -clean -apptype=gui -build -config=release -product=scripts/ted2go.products/$host/Ted2 ../src/ted2go/Ted2.monkey2
 
-$mx2cc makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+$mx2cc makeapp -clean -apptype=gui -build -config=release -product=scripts/launcher.products/$host/Launcher ../src/launcher/launcher.monkey2
 
 if [ "$OSTYPE" = "linux-gnu" ]
 then
@@ -31,12 +31,13 @@ then
 
 else
 
-	rm -r -f "$ted2"
-	cp -R "$ted2go_new" "$ted2"
+	rm -r -f $ted2
+	cp -R ./ted2go.products/macos/Ted2.app $ted2
+	
 	rm -r -f "$launcher"
-	cp -R "$launcher_new" "$launcher"
+	cp -R ./launcher.products/macos/Launcher.app "$launcher"
 	
 	cp ../src/launcher/info.plist "$launcher/Contents"
 	cp ../src/launcher/Monkey2logo.icns "$launcher/Contents/Resources"
-	
+
 fi

+ 4 - 2
scripts/updatemx2cc.sh

@@ -5,8 +5,10 @@ echo ""
 echo "***** Updating mx2cc *****"
 echo ""
 
+mkdir mx2cc.products
+
 $mx2cc makemods -config=release monkey libc miniz stb-image stb-image-write stb-vorbis std
 
-$mx2cc makeapp -apptype=console -config=release -product=src/mx2cc/mx2cc.products/mx2cc_$host ../src/mx2cc/mx2cc.monkey2
+$mx2cc makeapp -apptype=console -config=release -product=scripts/mx2cc.products/mx2cc_$host ../src/mx2cc/mx2cc.monkey2
 
-cp ..\src\mx2cc\mx2cc.products\mx2cc_$host %mx2cc%
+cp mx2cc.products/mx2cc_$host $mx2cc

+ 10 - 9
scripts/updateted2.sh

@@ -5,17 +5,17 @@ echo ""
 echo "***** Updating ted2 *****"
 echo ""
 
-$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
+$mx2cc makeapp -apptype=gui -build -config=release -product=scripts/ted2.products/$host/Ted2 ../src/ted2/ted2.monkey2
 
-$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+$mx2cc makeapp -apptype=gui -build -config=release -product=scripts/launcher.products/$host/Launcher ../src/launcher/launcher.monkey2
 
 if [ "$OSTYPE" = "linux-gnu" ]
 then
 
 	rm -r -f "$ted2"
 	mkdir "$ted2"
-	cp -R "$ted2_new/assets" "$ted2/assets"
-	cp "$ted2_new/ted2" "$ted2/ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/Ted2" "$ted2/ted2"
 	rm -r -f "$launcher"
 	cp "$launcher_new" "$launcher"
 
@@ -24,17 +24,18 @@ then
 
 	rm -r -f "$ted2"
 	mkdir "$ted2"
-	cp -R "$ted2_new/assets" "$ted2/assets"
-	cp "$ted2_new/ted2" "$ted2/ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/Ted2" "$ted2/ted2"
 	rm -r -f "$launcher"
 	cp "$launcher_new" "$launcher"
 
 else
 
-	rm -r -f "$ted2"
-	cp -R "$ted2_new" "$ted2"
+	rm -r -f $ted2
+	cp -R ./ted2.products/macos/Ted2.app $ted2
+	
 	rm -r -f "$launcher"
-	cp -R "$launcher_new" "$launcher"
+	cp -R ./launcher.products/macos/Launcher.app "$launcher"
 	
 	cp ../src/launcher/info.plist "$launcher/Contents"
 	cp ../src/launcher/Monkey2logo.icns "$launcher/Contents/Resources"

+ 6 - 5
scripts/updateted2go.sh

@@ -5,9 +5,9 @@ echo ""
 echo "***** Updating ted2 *****"
 echo ""
 
-$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2go/Ted2.monkey2
+$mx2cc makeapp -apptype=gui -build -config=release -product=scripts/ted2go.products/$host/Ted2 ../src/ted2go/Ted2.monkey2
 
-$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+$mx2cc makeapp -apptype=gui -build -config=release -product=scripts/launcher.products/$host/Launcher ../src/launcher/launcher.monkey2
 
 if [ "$OSTYPE" = "linux-gnu" ]
 then
@@ -31,10 +31,11 @@ then
 
 else
 
-	rm -r -f "$ted2"
-	cp -R "$ted2go_new" "$ted2"
+	rm -r -f $ted2
+	cp -R ./ted2go.products/macos/Ted2.app $ted2
+	
 	rm -r -f "$launcher"
-	cp -R "$launcher_new" "$launcher"
+	cp -R ./launcher.products/macos/Launcher.app "$launcher"
 	
 	cp ../src/launcher/info.plist "$launcher/Contents"
 	cp ../src/launcher/Monkey2logo.icns "$launcher/Contents/Resources"