forked from HaxeFoundation/haxe
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge waneck-changes from nightly-travis branch
- Loading branch information
Showing
12 changed files
with
223 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ INSTALL_BIN_DIR=$(INSTALL_DIR)/bin | |
INSTALL_LIB_DIR=$(INSTALL_DIR)/lib/haxe | ||
INSTALL_STD_DIR=$(INSTALL_DIR)/share/haxe/std | ||
PACKAGE_OUT_DIR=out | ||
INSTALLER_TMP_DIR=installer | ||
PACKAGE_SRC_EXTENSION=.tar.gz | ||
|
||
MAKEFILENAME?=Makefile | ||
|
@@ -155,7 +156,7 @@ quickcpp: build_src build_pass_4 copy_haxetoolkit | |
|
||
CPP_OS := $(shell uname) | ||
ifeq ($(CPP_OS),Linux) | ||
copy_haxetoolkit: | ||
copy_haxetoolkit: | ||
sudo cp haxe /usr/bin/haxe | ||
else | ||
copy_haxetoolkit: /cygdrive/c/HaxeToolkit/haxe/haxe.exe | ||
|
@@ -249,6 +250,53 @@ deploy_doc: | |
scp $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_doc.zip [email protected]:/data/haxeapi/www/v/dev/api-latest.zip | ||
ssh [email protected] "cd /data/haxeapi/www/v/dev && find . ! -name 'api-latest.zip' -maxdepth 1 -mindepth 1 -exec rm -rf {} + && unzip -q -o api-latest.zip" | ||
|
||
# Installer | ||
|
||
package_installer_mac: | ||
$(eval DOCFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_doc.zip) | ||
$(eval OUTFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.tar.gz) | ||
$(eval PACKFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_bin.tar.gz) | ||
$(eval VERSION := $(shell haxe -version 2>&1)) | ||
$(eval NEKOVER := $(shell neko -version 2>&1)) | ||
bash -c "rm -rf $(INSTALLER_TMP_DIR)/{resources,pkg,tgz,haxe.tar.gz}" | ||
mkdir $(INSTALLER_TMP_DIR)/resources | ||
# neko - unpack to change the dir name | ||
cd $(INSTALLER_TMP_DIR)/resources && tar -zxvf ../neko-osx64.tar.gz | ||
mv $(INSTALLER_TMP_DIR)/resources/neko* $(INSTALLER_TMP_DIR)/resources/neko | ||
cd $(INSTALLER_TMP_DIR)/resources && tar -zcvf neko.tar.gz neko | ||
# haxe - unpack to change the dir name | ||
cd $(INSTALLER_TMP_DIR)/resources && tar -zxvf $(PACKFILE) | ||
mv $(INSTALLER_TMP_DIR)/resources/haxe* $(INSTALLER_TMP_DIR)/resources/haxe | ||
cd $(INSTALLER_TMP_DIR)/resources && tar -zcvf haxe.tar.gz haxe | ||
# scripts | ||
cp -rf extra/mac-installer/* $(INSTALLER_TMP_DIR)/resources | ||
cd $(INSTALLER_TMP_DIR)/resources && tar -zcvf scripts.tar.gz scripts | ||
# installer structure | ||
mkdir -p $(INSTALLER_TMP_DIR)/pkg | ||
cd $(INSTALLER_TMP_DIR)/pkg && xar -xf ../resources/installer-structure.pkg . | ||
mkdir $(INSTALLER_TMP_DIR)/tgz; mv $(INSTALLER_TMP_DIR)/resources/*.tar.gz $(INSTALLER_TMP_DIR)/tgz | ||
cd $(INSTALLER_TMP_DIR)/tgz; find . | cpio -o --format odc | gzip -c > ../pkg/files.pkg/Payload | ||
cd $(INSTALLER_TMP_DIR)/pkg/files.pkg && bash -c "INSTKB=$$(du -sk ../../tgz | awk '{print $$1;}'); \ | ||
du -sk ../../tgz; \ | ||
echo $$INSTKB ; \ | ||
INSTKBH=`expr $$INSTKB - 4`; \ | ||
echo $$INSTKBH ;\ | ||
sed -i '' 's/%%INSTKB%%/$$INSTKBH/g' PackageInfo ;\ | ||
sed -i '' 's/%%VERSION%%/$(VERSION)/g' PackageInfo ;\ | ||
sed -i '' 's/%%VERSTRING%%/$(VERSION)/g' PackageInfo ;\ | ||
sed -i '' 's/%%VERLONG%%/$(VERSION)/g' PackageInfo ;\ | ||
sed -i '' 's/%%NEKOVER%%/$(NEKOVER)/g' PackageInfo ;\ | ||
cd .. ;\ | ||
sed -i '' 's/%%VERSION%%/$(VERSION)/g' Distribution ;\ | ||
sed -i '' 's/%%VERSTRING%%/$(VERSION)/g' Distribution ;\ | ||
sed -i '' 's/%%VERLONG%%/$(VERSION)/g' Distribution ;\ | ||
sed -i '' 's/%%NEKOVER%%/$(NEKOVER)/g' Distribution ;\ | ||
sed -i '' 's/%%INSTKB%%/$$INSTKBH/g' Distribution" | ||
# repackage | ||
cd $(INSTALLER_TMP_DIR)/pkg; xar --compression none -cf ../$(PACKAGE_FILE_NAME).pkg * | ||
# tar | ||
cd $(INSTALLER_TMP_DIR); tar -zcvf $(OUTFILE) $(PACKAGE_FILE_NAME).pkg | ||
|
||
# Clean | ||
|
||
clean: clean_libs clean_haxe clean_tools clean_package | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
<xml> | ||
|
||
<include name="${HXCPP}/build-tool/BuildCommon.xml"/> | ||
<set name="static_link" value="1" /> | ||
<set name="no_console" value="1" /> | ||
|
||
<files id="haxesetup"> | ||
<file name="setup.cpp" /> | ||
</files> | ||
|
||
<target id="default" output="haxesetup" tool="linker" toolid="exe"> | ||
<lib name="advapi32.lib" /> | ||
<files id="haxesetup" /> | ||
</target> | ||
|
||
</xml> |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/sh | ||
rm -f /usr/bin/haxe | ||
rm -f /usr/local/bin/haxe | ||
rm -f /usr/bin/haxedoc | ||
rm -f /usr/local/bin/haxedoc | ||
rm -f /usr/bin/haxelib | ||
rm -f /usr/local/bin/haxelib | ||
rm -f ~/.haxelib | ||
rm -f $HOME/.haxelib | ||
ln -s /usr/local/lib/haxe/haxe /usr/local/bin/haxe | ||
cp /usr/local/lib/haxe/haxelib /usr/local/bin/haxelib | ||
mkdir -p /usr/local/lib/haxe/lib | ||
chmod 777 /usr/local/lib/haxe/lib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#!/bin/sh | ||
|
||
#ensure no conflicting version is left there | ||
rm -rf /usr/lib/haxe/std | ||
rm -rf /usr/lib/haxe/doc | ||
rm -f /usr/lib/haxe/haxe | ||
rm -rf /usr/local/lib/haxe/std | ||
rm -rf /usr/local/lib/haxe/doc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#!/bin/sh | ||
cd $(dirname $0) | ||
# haxe | ||
chmod +x * | ||
./haxe-preinstall.sh | ||
rm -f /usr/lib/haxe | ||
rm -f /usr/local/lib/haxe | ||
mkdir -p /usr/local/lib/haxe | ||
mkdir -p /usr/local/bin | ||
cp -Rf ../haxe/* /usr/local/lib/haxe | ||
./haxe-postinstall.sh | ||
./neko-preinstall.sh | ||
rm -f /usr/local/lib/neko | ||
mkdir -p /usr/local/lib/neko | ||
cp -Rf ../neko/* /usr/local/lib/neko | ||
./neko-postinstall.sh | ||
cd ../ | ||
rm -Rf /tmp/haxe |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#!/bin/sh | ||
rm -f /usr/bin/neko | ||
rm -f /usr/bin/nekoc | ||
rm -f /usr/bin/nekoml | ||
rm -f /usr/bin/nekotools | ||
rm -f /usr/lib/libneko.dylib | ||
rm -f /usr/local/bin/neko | ||
rm -f /usr/local/bin/nekoc | ||
rm -f /usr/local/bin/nekoml | ||
rm -f /usr/local/bin/nekotools | ||
rm -f /usr/local/lib/libneko*.dylib | ||
|
||
ln -s /usr/local/lib/neko/neko /usr/local/bin/neko | ||
ln -s /usr/local/lib/neko/nekoc /usr/local/bin/nekoc | ||
ln -s /usr/local/lib/neko/nekoml /usr/local/bin/nekoml | ||
ln -s /usr/local/lib/neko/nekotools /usr/local/bin/nekotools | ||
ln -s /usr/local/lib/neko/libneko.dylib /usr/local/lib/libneko.dylib | ||
ln -s /usr/local/lib/neko/libneko.2.dylib /usr/local/lib/libneko.2.dylib | ||
ln -s /usr/local/lib/neko/libneko.2.1.0.dylib /usr/local/lib/libneko.2.1.0.dylib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
#!/bin/sh | ||
rm -rf /usr/lib/neko | ||
rm -rf /usr/local/lib/neko |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters