Selaa lähdekoodia

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.
Lauri Ojansivu 5 vuotta sitten
vanhempi
sitoutus
88573ad2cd
5 muutettua tiedostoa jossa 4 lisäystä ja 5 poistoa
  1. 1 1
      Dockerfile
  2. 1 1
      rebuild-wekan.bat
  3. 1 1
      rebuild-wekan.sh
  4. 0 1
      releases/rebuild-release.sh
  5. 1 1
      snapcraft.yaml

+ 1 - 1
Dockerfile

@@ -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 && \

+ 1 - 1
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

+ 1 - 1
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

+ 0 - 1
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

+ 1 - 1
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