Skip to content

Commit

Permalink
Two stage makefile include.
Browse files Browse the repository at this point in the history
  • Loading branch information
seanmorris committed Jun 24, 2024
1 parent e4934ba commit 795da2b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -231,22 +231,22 @@ endif

PRELOAD_NAME=php

-include packages/php-cgi-wasm/pre.mak
-include $(addsuffix /pre.mak,$(shell npm ls -p))

ifdef PRELOAD_ASSETS
# DEPENDENCIES+=
PHP_ASSET_LIST+= ${PRELOAD_NAME}.data
ORDER_ONLY+=.cache/preload-collected
EXTRA_FLAGS+= --preload-name ${PRELOAD_NAME} ${PRELOAD_METHOD} /src/third_party/preload@/preload

${PHP_ASSET_PATH}/${PRELOAD_NAME}.data: .cache/preload-collected
cp -Lprf packages/php-wasm/${PRELOAD_NAME}.data ${PHP_ASSET_PATH}/
endif

-include packages/php-cgi-wasm/pre.mak
-include $(addsuffix /pre.mak,$(shell npm ls -p))

-include packages/php-cgi-wasm/static.mak
-include $(addsuffix /static.mak,$(shell npm ls -p))

${PHP_ASSET_PATH}/${PRELOAD_NAME}.data: .cache/preload-collected
cp -Lprf packages/php-wasm/${PRELOAD_NAME}.data ${PHP_ASSET_PATH}/

########### Collect & patch the source code. ###########

third_party/php${PHP_VERSION}-src/patched: third_party/php${PHP_VERSION}-src/.gitignore
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php-wasm-dom": "^0.0.0-j",
"php-wasm-gd": "^0.0.9-i",
"php-wasm-iconv": "^0.0.9-j",
"php-wasm-intl": "^0.0.0-j",
"php-wasm-intl": "^0.0.0-l",
"php-wasm-libxml": "^0.0.9-p",
"php-wasm-libzip": "^0.0.9-g",
"php-wasm-mbstring": "^0.0.0-c",
Expand Down
3 changes: 2 additions & 1 deletion packages/intl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"url": "git+https://github.com/seanmorris/php-wasm.git"
},
"author": "Sean Morris <php-wasm@seanmorr.is>",
"version": "0.0.0-k",
"version": "0.0.0-l",
"main": "index.mjs",
"files": [
"index.mjs",
Expand All @@ -16,6 +16,7 @@
"LICENSE",
"NOTICE",
"README.md",
"pre.mak",
"static.mak",
"php8.3-intl.so",
"php8.2-intl.so",
Expand Down

0 comments on commit 795da2b

Please sign in to comment.