Skip to content

Fix build system #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix build system #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8380bd3
Remove dependency on streamline in Makefile's SocialCalc.js rule.
herve0742 Mar 18, 2022
b94d176
Use a temporary file to preserve target timestamp in Makefile.
herve0742 Mar 18, 2022
5b30fb5
Update package-lock.json and yarn.lock as computed by latest npm.
herve0742 Mar 18, 2022
82ce485
Install newer uglify-js in dev dependecies.
herve0742 Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,18 @@ static/multi.js :: multi/main.ls multi/styles.styl

depends: app.js static/ethercalc.js static/start.css static/multi.js

node_modules/socialcalc/dist/SocialCalc.js: ./node_modules/streamline/bin/_node
node_modules/socialcalc/dist/SocialCalc.js:
@-mkdir -p node_modules/socialcalc/dist
cp node_modules/socialcalc/SocialCalc.js node_modules/socialcalc/dist/SocialCalc.js || true

static/ethercalc.js: $(ETHERCALC_FILES) \
./node_modules/socialcalc/dist/SocialCalc.js \
./node_modules/uglify-js/bin/uglifyjs
@-mkdir -p .git
@echo '// Auto-generated from "make depends"; ALL CHANGES HERE WILL BE LOST!' > $@
node node_modules/uglify-js/bin/uglifyjs node_modules/socialcalc/dist/SocialCalc.js $(ETHERCALC_FILES) $(UGLIFYJS_ARGS) --source-map ethercalc.js.map --source-map-include-sources >> $@
mv ethercalc.js.map static
@echo '// Auto-generated from "make depends"; ALL CHANGES HERE WILL BE LOST!' > ethercalc.js.tmp
node node_modules/uglify-js/bin/uglifyjs node_modules/socialcalc/dist/SocialCalc.js $(ETHERCALC_FILES) $(UGLIFYJS_ARGS) --source-map --output ethercalc.js.tmp
mv ethercalc.js.tmp $@
mv ethercalc.js.tmp.map static/ethercalc.js.map

COFFEE := $(shell command -v coffee 2> /dev/null)
.coffee.js:
Expand Down
Loading