mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-11 11:15:24 +03:00
Merge pull request #1051 from pulsar-edit/vendorize-libiconv
Fix macOS binaries by vendorizing `libiconv`
This commit is contained in:
commit
3c93cf0b1c
@ -137,7 +137,6 @@ silicon_mac_task:
|
|||||||
- brew update
|
- brew update
|
||||||
- brew uninstall node@20
|
- brew uninstall node@20
|
||||||
- brew install git python@$PYTHON_VERSION python-setuptools
|
- brew install git python@$PYTHON_VERSION python-setuptools
|
||||||
- brew install libiconv
|
|
||||||
- git submodule init
|
- git submodule init
|
||||||
- git submodule update
|
- git submodule update
|
||||||
- ln -s /opt/homebrew/bin/python$PYTHON_VERSION /opt/homebrew/bin/python
|
- ln -s /opt/homebrew/bin/python$PYTHON_VERSION /opt/homebrew/bin/python
|
||||||
@ -151,13 +150,9 @@ silicon_mac_task:
|
|||||||
- sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json
|
- sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json
|
||||||
install_script:
|
install_script:
|
||||||
- export PATH="/opt/homebrew/bin:$PATH"
|
- export PATH="/opt/homebrew/bin:$PATH"
|
||||||
- export LDFLAGS="-L$(brew --prefix)/opt/libiconv/lib"
|
|
||||||
- export CPPFLAGS="-I$(brew --prefix)/opt/libiconv/include"
|
|
||||||
- yarn install --ignore-engines || yarn install --ignore-engines
|
- yarn install --ignore-engines || yarn install --ignore-engines
|
||||||
build_script:
|
build_script:
|
||||||
- export PATH="/opt/homebrew/bin:$PATH"
|
- export PATH="/opt/homebrew/bin:$PATH"
|
||||||
- export LDFLAGS="-L$(brew --prefix)/opt/libiconv/lib"
|
|
||||||
- export CPPFLAGS="-I$(brew --prefix)/opt/libiconv/include"
|
|
||||||
- yarn build
|
- yarn build
|
||||||
- yarn run build:apm
|
- yarn run build:apm
|
||||||
build_binary_script:
|
build_binary_script:
|
||||||
|
@ -25,7 +25,9 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"electronVersion": "12.2.3",
|
"electronVersion": "12.2.3",
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244"
|
"es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244",
|
||||||
|
"superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943",
|
||||||
|
"text-buffer/superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@atom/source-map-support": "^0.3.4",
|
"@atom/source-map-support": "^0.3.4",
|
||||||
@ -165,7 +167,7 @@
|
|||||||
"spell-check": "file:packages/spell-check",
|
"spell-check": "file:packages/spell-check",
|
||||||
"status-bar": "file:packages/status-bar",
|
"status-bar": "file:packages/status-bar",
|
||||||
"styleguide": "file:./packages/styleguide",
|
"styleguide": "file:./packages/styleguide",
|
||||||
"superstring": "^2.4.4",
|
"superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943",
|
||||||
"symbol-provider-ctags": "file:./packages/symbol-provider-ctags",
|
"symbol-provider-ctags": "file:./packages/symbol-provider-ctags",
|
||||||
"symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter",
|
"symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter",
|
||||||
"symbols-view": "file:./packages/symbols-view",
|
"symbols-view": "file:./packages/symbols-view",
|
||||||
|
@ -9027,10 +9027,9 @@ superagent@^8.0.9:
|
|||||||
qs "^6.11.0"
|
qs "^6.11.0"
|
||||||
semver "^7.3.8"
|
semver "^7.3.8"
|
||||||
|
|
||||||
superstring@^2.4.4:
|
superstring@^2.4.4, "superstring@github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943":
|
||||||
version "2.4.4"
|
version "2.4.4"
|
||||||
resolved "https://registry.yarnpkg.com/superstring/-/superstring-2.4.4.tgz#d5df5b080deb5605ffd88b6cdbaf17a0b30d5f0e"
|
resolved "https://codeload.github.com/pulsar-edit/superstring/tar.gz/de97b496663fce40050bf2d66e1466ccfbd00943"
|
||||||
integrity sha512-41LWIGzy6tkUM6jUwbXTeGOLui3gGBxgV6m8gIWRzv1WdW0HV6oANHdGanRrM04mwFXXExII9OQ/XxaqU+Ft9w==
|
|
||||||
dependencies:
|
dependencies:
|
||||||
nan "^2.14.2"
|
nan "^2.14.2"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user