ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 11:16:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

expand support for publishing LZMA artifacts

Browse Source
This commit is contained in:
Joel Dice 2015-04-07 16:55:45 -06:00
parent e60f53db73
commit 8022bd9733
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@ -262,6 +262,20 @@ publishing {
type "a" type "a"
extension "a" extension "a"
} }
if (buildOption == "-lzma") {
artifact("${nativeBuildDir}/libavian-lzma.a") {
name "libavian-lzma"
type "a"
extension "a"
}
artifact("${nativeBuildDir}/lzma/lzma") {
name "lzma"
type publishBinSuffix
extension binSuffix
}
}
} }
} }
} }

21
makefile
View File

@ -1409,6 +1409,8 @@ ifneq ($(lzma),)
$(call generator-c-objects,$(lzma-encoder-lzma-sources),$(lzma)/C,$(build)) $(call generator-c-objects,$(lzma-encoder-lzma-sources),$(lzma)/C,$(build))
lzma-loader = $(build)/lzma/load.o lzma-loader = $(build)/lzma/load.o
lzma-library = $(build)/libavian-lzma.a
endif endif
generator-cpp-objects = \ generator-cpp-objects = \
@ -1586,11 +1588,11 @@ test-args = $(test-flags) $(input)
.PHONY: build .PHONY: build
ifneq ($(supports_avian_executable),false) ifneq ($(supports_avian_executable),false)
build: $(static-library) $(executable) $(dynamic-library) $(lzma-loader) \ build: $(static-library) $(executable) $(dynamic-library) $(lzma-library) \
$(lzma-encoder) $(executable-dynamic) $(classpath-dep) $(test-dep) \ $(lzma-encoder) $(executable-dynamic) $(classpath-dep) $(test-dep) \
$(test-extra-dep) $(embed) $(build)/classpath.jar $(test-extra-dep) $(embed) $(build)/classpath.jar
else else
build: $(static-library) $(dynamic-library) $(lzma-loader) \ build: $(static-library) $(dynamic-library) $(lzma-library) \
$(lzma-encoder) $(classpath-dep) $(test-dep) \ $(lzma-encoder) $(classpath-dep) $(test-dep) \
$(test-extra-dep) $(embed) $(build)/classpath.jar $(test-extra-dep) $(embed) $(build)/classpath.jar
endif endif
@ -1920,6 +1922,21 @@ $(lzma-encoder-objects): $(build)/lzma/%.o: $(src)/lzma/%.cpp
$(lzma-encoder): $(lzma-encoder-objects) $(lzma-encoder-lzma-objects) $(lzma-encoder): $(lzma-encoder-objects) $(lzma-encoder-lzma-objects)
$(build-cc) $(^) -g -o $(@) $(build-cc) $(^) -g -o $(@)
$(lzma-library): $(lzma-loader) $(lzma-decode-objects)
@echo "creating $(@)"
@rm -rf $(build)/libavian-lzma
@mkdir -p $(build)/libavian-lzma
rm -rf $(@)
for x in $(^); \
do cp $${x} $(build)/libavian-lzma/$$(echo $${x} | sed s:/:_:g); \
done
ifdef ms_cl_compiler
$(ar) $(arflags) $(build)/libavian-lzma/*.o -out:$(@)
else
$(ar) cru $(@) $(build)/libavian-lzma/*.o
$(ranlib) $(@)
endif
$(lzma-loader): $(src)/lzma/load.cpp $(lzma-loader): $(src)/lzma/load.cpp
$(compile-object) $(compile-object)