ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-02 07:30:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing dos2unix call before patching (breaks on MacOS)

Browse Source
This commit is contained in:
Vasily Litvinov 2014-04-05 01:16:10 +04:00
parent a69c4be102
commit 84a102247d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
makefile
View File

@ -1586,12 +1586,14 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/ cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/
cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \ cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \
$(xml-java)/* $(build)/android-src/ $(xml-java)/* $(build)/android-src/
# convert line endings... otherwise patches are difficult ifeq ($(platform),windows)
# do that by first "dry-running" the patch to determine which files are patched # convert line endings... otherwise patches are difficult
patch -d $(build)/android-src -p1 --dry-run -f < android-patches.diff | \ # do that by first "dry-running" the patch to determine which files are patched
grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \ patch -d $(build)/android-src -p1 --dry-run -f < android-patches.diff | \
( cd $(build)/android-src && xargs dos2unix ) grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \
# now patch the files ( cd $(build)/android-src && xargs dos2unix )
# now patch the files
endif
( cd $(build)/android-src && patch -p1 ) < android-patches.diff ( cd $(build)/android-src && patch -p1 ) < android-patches.diff
find $(build)/android-src -name '*.java' > $(build)/android.txt find $(build)/android-src -name '*.java' > $(build)/android.txt
$(javac) -Xmaxerrs 1000 -d $(build)/android -sourcepath $(luni-java) \ $(javac) -Xmaxerrs 1000 -d $(build)/android -sourcepath $(luni-java) \