Skip to content

Commit

Permalink
Migration to OPP5.2 finished
Browse files Browse the repository at this point in the history
  • Loading branch information
kvetak committed Mar 27, 2018
1 parent 4d84ab0 commit 0593a1c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .oppbuildspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<buildspec version="4.0">
<dir makemake-options="--deep --nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="." type="custom"/>
<dir makemake-options="--deep --make-so -o rinasim -O out -lrinasimcore --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="policies" type="makemake"/>
<dir makemake-options="--deep --make-lib -o rinasimcore -O out --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
<dir makemake-options="--make-lib --deep -o rinasimcore -O out --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
<dir path="." type="custom"/>
<dir makemake-options="--make-so --deep -o rinasim -O out -lrinasimcore$(D) --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="policies" type="makemake"/>
</buildspec>
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ all:
# TODO: atrocious, rewrite
# $(Q)test -f src/Makefile -a -f policies/Makefile || make makefiles
$(qecho) Creating library librinasimcore ...
$(Q)if [ -d $(PROJECT_OUTPUT_DIR) ]; then \
# $(Q)if [ -d $(PROJECT_OUTPUT_DIR) ]; then \
find $(PROJECT_OUTPUT_DIR) -type f -name "librinasim.*" -exec rm -rf {} \;; fi
$(Q)cd src && $(MAKE) all
$(qecho) Creating library librinasim ...
Expand Down Expand Up @@ -87,7 +87,7 @@ msgheaders:
clean: cleansrc cleanpolicies
$(qecho) Cleaning project ...
$(Q)rm -rf $(O)
$(Q)rm -f librinasim.so librinasim.dll librinasimcore.a librinasimcore.lib
$(Q)rm -f ./policies/librinasim.so ./policies/librinasim.dll ./src/librinasimcore.a ./src/librinasimcore.lib

cleanall: clean
$(Q)rm -rf $(PROJECT_OUTPUT_DIR)
Expand Down
3 changes: 3 additions & 0 deletions examples/Demos/UseCase5/.qtenvrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[General]
last-configname=Ping
last-runnumber=0

0 comments on commit 0593a1c

Please sign in to comment.