diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-03-01 22:07:55 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-03-01 22:07:55 +0200 |
commit | 88573ad2cdb8596b795a82ef40a0662180e8a7d7 (patch) | |
tree | 3fa706cdaa6ed91820042697a0dfa78ca1ba2d7d | |
parent | 058180687a6ad9caafa0b31504c6345310f6d7ee (diff) | |
download | wekan-88573ad2cdb8596b795a82ef40a0662180e8a7d7.tar.gz wekan-88573ad2cdb8596b795a82ef40a0662180e8a7d7.tar.bz2 wekan-88573ad2cdb8596b795a82ef40a0662180e8a7d7.zip |
Try to revert remaining of the following changes:
- Revert change made at Wekan v3.81, because building did not work: [Try to make Meteor build time shorter
by excluding legacy and cordova. This was made possible by
Meteor 1.10-rc.2](https://github.com/wekan/wekan/commit/0d3002f69d97e646fa7368bfdade4f78c51e9884).
Thanks to xet7.
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | rebuild-wekan.bat | 2 | ||||
-rwxr-xr-x | rebuild-wekan.sh | 2 | ||||
-rwxr-xr-x | releases/rebuild-release.sh | 1 | ||||
-rw-r--r-- | snapcraft.yaml | 2 |
5 files changed, 4 insertions, 5 deletions
@@ -249,7 +249,7 @@ RUN \ chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \ #gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan npm install && \ - gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build --exclude-archs web.browser.legacy,web.cordova && \ + gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ #rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \ chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index e61c20be..0a9a8eac 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -51,7 +51,7 @@ cd .. REM del /S /F /Q node_modules
call meteor npm install
REM del /S /F /Q .build
-call meteor build .build --directory --exclude-archs web.browser.legacy,web.cordova
+call meteor build .build --directory
copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js
cd .build\bundle\programs\server
call meteor npm install
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 0bf6c68a..957e634f 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -146,7 +146,7 @@ do rm -rf node_modules .meteor/local npm install rm -rf .build - meteor build .build --directory --exclude-archs web.browser.legacy,web.cordova + meteor build .build --directory cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh index c8864c1b..e8393313 100755 --- a/releases/rebuild-release.sh +++ b/releases/rebuild-release.sh @@ -10,7 +10,6 @@ rm -rf node_modules meteor npm install rm -rf .build meteor build .build --directory -# --exclude-archs web.browser.legacy,web.cordova cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js cd .build/bundle/programs/server rm -rf node_modules diff --git a/snapcraft.yaml b/snapcraft.yaml index f59e3200..2b6b1ef9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -206,7 +206,7 @@ parts: meteor add standard-minifier-js --allow-superuser meteor npm install --allow-superuser meteor npm install --allow-superuser --save babel-runtime - meteor build .build --directory --allow-superuser --exclude-archs web.browser.legacy,web.cordova + meteor build .build --directory --allow-superuser cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac |