Updated.

scripts/common.sh

@@ -8,35 +8,25 @@ launcher_new=""
 
 if [ "$OSTYPE" = "linux-gnu" ]
 then
+
 	host="linux"
 	mx2cc="../bin/mx2cc_linux"
-	
 	ted2="../bin/ted2_linux"
-	ted2_new="../src/ted2/ted2.buildv1.1.07/linux_release"
-	ted2go_new="../src/ted2go/Ted2.buildv1.1.07/linux_release"
-	
 	launcher="../Monkey2 (Linux)"
-	launcher_new="../src/launcher/launcher.buildv1.1.07/linux_release/launcher"
 	
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
+
 	host="raspbian"
 	mx2cc="../bin/mx2cc_raspbian"
-	
 	ted2="../bin/ted2_raspbian"
-	ted2_new="../src/ted2/ted2.buildv1.1.06/raspbian_release"
-	ted2go_new="../src/ted2go/Ted2.buildv1.1.06/raspbian_release"
-	
 	launcher="../Monkey2 (Raspbian)"
-	launcher_new="../src/launcher/launcher.buildv1.1.06/raspbian_release/launcher"
+	
 else
+
 	host="macos"
 	mx2cc="../bin/mx2cc_macos"
-	
 	ted2="../bin/ted2_macos.app"
-	ted2_new="../src/ted2/ted2.buildv1.1.07/macos_release/ted2.app"
-	ted2go_new="../src/ted2go/Ted2.buildv1.1.07/macos_release/Ted2.app"
-	
 	launcher="../Monkey2 (Macos).app"
-	launcher_new="../src/launcher/launcher.buildv1.1.07/macos_release/launcher.app"
+	
 fi

scripts/rebuildted2.sh

@@ -5,38 +5,41 @@ echo ""
 echo "***** Rebuilding ted2 *****"
 echo ""
 
-$mx2cc makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/ted2/ted2.monkey2
+$mx2cc makeapp -clean -apptype=gui -build -config=release -product=scripts/ted2.products/$host/ted2 ../src/ted2/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
 
-	rm -r -f "$ted2"
-	mkdir "$ted2"
-	cp -R "$ted2_new/assets" "$ted2/assets"
-	cp "$ted2_new/ted2" "$ted2/ted2"
+	rm -r -f $ted2
+	mkdir $ted2
+	cp -R ./ted2.products/$host/assets $ted2/assets
+	cp ./ted2.products/$host/ted2 $ted2/ted2
+	
 	rm -r -f "$launcher"
-	cp "$launcher_new" "$launcher"
+	cp ./launcher.products/$host/launcher "$launcher"
 
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
 
-	rm -r -f "$ted2"
-	mkdir "$ted2"
-	cp -R "$ted2_new/assets" "$ted2/assets"
-	cp "$ted2_new/ted2" "$ted2/ted2"
+	rm -r -f $ted2
+	mkdir $ted2
+	cp -R ./ted2.products/$host/assets $ted2/assets
+	cp ./ted2.products/$host/ted2 $ted2/ted2
+	
 	rm -r -f "$launcher"
-	cp "$launcher_new" "$launcher"
+	cp ./launcher.products/$host/launcher "$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"
-	
+
 fi

scripts/rebuildted2go.sh

@@ -2,7 +2,7 @@
 source common.sh
 
 echo ""
-echo "***** Rebuilding ted2 *****"
+echo "***** Rebuilding ted2go *****"
 echo ""
 
 $mx2cc makeapp -clean -apptype=gui -build -config=release -product=scripts/ted2go.products/$host/ted2 ../src/ted2go/Ted2.monkey2
@@ -14,26 +14,27 @@ then
 
 	rm -r -f $ted2
 	mkdir $ted2
-	cp -R ./ted2go.products/linux/assets $ted2/assets
-	cp ./ted2go.products/linux/ted2 $ted2/ted2
+	cp -R ./ted2go.products/$host/assets $ted2/assets
+	cp ./ted2go.products/$host/ted2 $ted2/ted2
 	
 	rm -r -f "$launcher"
-	cp ./launcher.products/linux/launcher "$launcher"
+	cp ./launcher.products/$host/launcher "$launcher"
 
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
 
-	rm -r -f "$ted2"
-	mkdir "$ted2"
-	cp -R "$ted2go_new/assets" "$ted2/assets"
-	cp "$ted2go_new/Ted2" "$ted2/ted2"
+	rm -r -f $ted2
+	mkdir $ted2
+	cp -R ./ted2go.products/$host/assets $ted2/assets
+	cp ./ted2go.products/$host/ted2 $ted2/ted2
+	
 	rm -r -f "$launcher"
-	cp "$launcher_new" "$launcher"
+	cp ./launcher.products/$host/launcher "$launcher"
 
 else
 
 	rm -r -f $ted2
-	cp -R ./ted2go.products/macos/Ted2.app $ted2
+	cp -R ./ted2go.products/macos/ted2.app $ted2
 	
 	rm -r -f "$launcher"
 	cp -R ./launcher.products/macos/Launcher.app "$launcher"

scripts/updateted2.sh

@@ -5,34 +5,36 @@ echo ""
 echo "***** Updating ted2 *****"
 echo ""
 
-$mx2cc makeapp -apptype=gui -build -config=release -product=scripts/ted2.products/$host/Ted2 ../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 -product=scripts/launcher.products/$host/Launcher ../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 "$ted2go_new/assets" "$ted2/assets"
-	cp "$ted2go_new/Ted2" "$ted2/ted2"
+	rm -r -f $ted2
+	mkdir $ted2
+	cp -R ./ted2.products/$host/assets $ted2/assets
+	cp ./ted2.products/$host/ted2 $ted2/ted2
+	
 	rm -r -f "$launcher"
-	cp "$launcher_new" "$launcher"
+	cp ./launcher.products/$host/launcher "$launcher"
 
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
 
-	rm -r -f "$ted2"
-	mkdir "$ted2"
-	cp -R "$ted2go_new/assets" "$ted2/assets"
-	cp "$ted2go_new/Ted2" "$ted2/ted2"
+	rm -r -f $ted2
+	mkdir $ted2
+	cp -R ./ted2.products/$host/assets $ted2/assets
+	cp ./ted2.products/$host/ted2 $ted2/ted2
+	
 	rm -r -f "$launcher"
-	cp "$launcher_new" "$launcher"
+	cp ./launcher.products/$host/launcher "$launcher"
 
 else
 
 	rm -r -f $ted2
-	cp -R ./ted2.products/macos/Ted2.app $ted2
+	cp -R ./ted2.products/macos/ted2.app $ted2
 	
 	rm -r -f "$launcher"
 	cp -R ./launcher.products/macos/Launcher.app "$launcher"

scripts/updateted2go.sh

@@ -2,7 +2,7 @@
 source common.sh
 
 echo ""
-echo "***** Updating ted2 *****"
+echo "***** Updating ted2go *****"
 echo ""
 
 $mx2cc makeapp -apptype=gui -build -config=release -product=scripts/ted2go.products/$host/ted2 ../src/ted2go/Ted2.monkey2
@@ -14,26 +14,27 @@ then
 
 	rm -r -f $ted2
 	mkdir $ted2
-	cp -R ./ted2go.products/linux/assets $ted2/assets
-	cp ./ted2go.products/linux/ted2 $ted2/ted2
+	cp -R ./ted2go.products/$host/assets $ted2/assets
+	cp ./ted2go.products/$host/ted2 $ted2/ted2
 	
 	rm -r -f "$launcher"
-	cp ./launcher.products/linux/launcher "$launcher"
+	cp ./launcher.products/$host/launcher "$launcher"
 
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
 
-	rm -r -f "$ted2"
-	mkdir "$ted2"
-	cp -R "$ted2go_new/assets" "$ted2/assets"
-	cp "$ted2go_new/Ted2" "$ted2/ted2"
+	rm -r -f $ted2
+	mkdir $ted2
+	cp -R ./ted2go.products/$host/assets $ted2/assets
+	cp ./ted2go.products/$host/ted2 $ted2/ted2
+	
 	rm -r -f "$launcher"
-	cp "$launcher_new" "$launcher"
+	cp ./launcher.products/$host/launcher "$launcher"
 
 else
 
 	rm -r -f $ted2
-	cp -R ./ted2go.products/macos/Ted2.app $ted2
+	cp -R ./ted2go.products/macos/ted2.app $ted2
 	
 	rm -r -f "$launcher"
 	cp -R ./launcher.products/macos/Launcher.app "$launcher"