diff --git a/web/source/build.sh b/web/source/build.sh index 1053daed88..8a53e5f73b 100755 --- a/web/source/build.sh +++ b/web/source/build.sh @@ -230,22 +230,23 @@ if [ $BUILD_EMBED = true ]; then assert $INTERMEDIATE/keyman.js echo Embedded TypeScript compiled as $INTERMEDIATE/keyman.js + copy_resources "$INTERMEDIATE" # In case some build ever wants them with an unminified, embedded-only build + if [ $DO_MINIFY = true ]; then minify keyman.js $EMBED_OUTPUT SIMPLE_OPTIMIZATIONS "KeymanBase.__BUILD__=$BUILD" assert $EMBED_OUTPUT/keyman.js echo Compiled embedded application saved as $EMBED_OUTPUT/keyman.js + + # Update any changed resources + # echo Copy or update resources + + copy_resources "$EMBED_OUTPUT" + + # Update build number if successful + echo + echo KMEA/KMEI build $BUILD compiled and saved under $EMBED_OUTPUT + echo fi - - # Update any changed resources - - # echo Copy or update resources - - cp -Rf $SOURCE/resources $EMBED_OUTPUT/ >/dev/null - - # Update build number if successful - echo - echo KMEA/KMEI build $BUILD compiled and saved under $EMBED_OUTPUT - echo fi if [ $BUILD_COREWEB = true ]; then @@ -259,7 +260,6 @@ if [ $BUILD_COREWEB = true ]; then assert $INTERMEDIATE/keymanweb.js echo Native TypeScript compiled as $INTERMEDIATE/keymanweb.js - copy_resources "$INTERMEDIATE" if [ $DO_MINIFY = true ]; then diff --git a/windows/src/developer/TIKE/Makefile b/windows/src/developer/TIKE/Makefile index 35c2252e0c..7d4efd773b 100644 --- a/windows/src/developer/TIKE/Makefile +++ b/windows/src/developer/TIKE/Makefile @@ -30,19 +30,19 @@ pull-keymanweb: # cd $(ROOT)\..\web\source !ifdef GIT_BASH_FOR_KEYMAN - $(GIT_BASH_FOR_KEYMAN) build.sh + $(GIT_BASH_FOR_KEYMAN) build.sh -no_minify !else - start /wait ./build.sh + start /wait ./build.sh -no_minify !endif -rd /s/q $(ROOT)\src\developer\tike\xml\kmw\resource mkdir $(ROOT)\src\developer\tike\xml\kmw\resource - xcopy /y $(ROOT)\..\web\release\web\*.js $(ROOT)\src\developer\tike\xml\kmw\resource\ # - xcopy /y $(ROOT)\..\web\release\web\*.js.map $(ROOT)\src\developer\tike\xml\kmw\resource\ # + xcopy /y $(ROOT)\..\web\intermediate\*.js $(ROOT)\src\developer\tike\xml\kmw\resource\ # + xcopy /y $(ROOT)\..\web\intermediate\*.js.map $(ROOT)\src\developer\tike\xml\kmw\resource\ # xcopy /y $(ROOT)\..\web\LICENSE $(ROOT)\src\developer\tike\xml\kmw\resource\ # xcopy /y $(ROOT)\..\web\README.md $(ROOT)\src\developer\tike\xml\kmw\resource\ # - xcopy /s /y $(ROOT)\..\web\release\web\osk\* $(ROOT)\src\developer\tike\xml\kmw\resource\osk\ # - xcopy /s /y $(ROOT)\..\web\release\web\ui\* $(ROOT)\src\developer\tike\xml\kmw\resource\ui\ # + xcopy /s /y $(ROOT)\..\web\intermediate\osk\* $(ROOT)\src\developer\tike\xml\kmw\resource\osk\ # + xcopy /s /y $(ROOT)\..\web\intermediate\ui\* $(ROOT)\src\developer\tike\xml\kmw\resource\ui\ # icons: rc icons.rc