Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-20 17:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Try to revert remaining of the following changes:

Browse source 
- 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](0d3002f69d).

Thanks to xet7.
This commit is contained in:
Lauri Ojansivu 2020-03-01 22:07:55 +02:00
parent 058180687a
commit 88573ad2cd
5 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -249,7 +249,7 @@ RUN \
chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \ 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 /home/wekan/.meteor/meteor add standard-minifier-js && \
gosu wekan:wekan npm install && \ 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 && \ 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 && \ #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 && \ chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \

2
rebuild-wekan.bat
View file

@ -51,7 +51,7 @@ cd ..
REM del /S /F /Q node_modules REM del /S /F /Q node_modules
call meteor npm install call meteor npm install
REM del /S /F /Q .build 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 copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js
cd .build\bundle\programs\server cd .build\bundle\programs\server
call meteor npm install call meteor npm install

2
rebuild-wekan.sh
View file

@ -146,7 +146,7 @@ do
rm -rf node_modules .meteor/local rm -rf node_modules .meteor/local
npm install npm install
rm -rf .build 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 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. #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac

1
releases/rebuild-release.sh
View file

@ -10,7 +10,6 @@ rm -rf node_modules
meteor npm install meteor npm install
rm -rf .build rm -rf .build
meteor build .build --directory 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 cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
cd .build/bundle/programs/server cd .build/bundle/programs/server
rm -rf node_modules rm -rf node_modules

2
snapcraft.yaml
View file

@ -206,7 +206,7 @@ parts:
meteor add standard-minifier-js --allow-superuser meteor add standard-minifier-js --allow-superuser
meteor npm install --allow-superuser meteor npm install --allow-superuser
meteor npm install --allow-superuser --save babel-runtime 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 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. #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac