Skip to content

Commit 8a27a0d

Browse files
committed
#20c720d packaging workfloaw and wfrest
1 parent 58dcf91 commit 8a27a0d

File tree

8 files changed

+63
-4
lines changed

8 files changed

+63
-4
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<cr id="20c720dd74608005dbd446665650cf173bb7616d58b34792d0b6acee385b3534" state="open">
2+
<cr id="20c720dd74608005dbd446665650cf173bb7616d58b34792d0b6acee385b3534" state="working">
33
<title>Packaging wfrest</title>
44
<reporter>sdevaux</reporter>
55
<creation>2025-05-09 23:04:47+02:00</creation>
66
<description></description>
77
<links>
88
<link name="parent">7bc74cc796c455a46d699ad91f6aca5b7c790f56a6a0968b4ecbce33efce9d25</link>
99
</links>
10-
<cf v="null"/>
10+
<cf v="Sebastien Devaux 2025-05-09T23:05:36+02:00"/>
1111
</cr>

lib/extlib.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ endif
6868

6969
$(INSTDIR)/import.mk: $(SRCDIR)/Makefile $(PATCHES)
7070
mkdir -p ${@D}
71-
@make -C $(SRCDIR) $(MARGS)
71+
@make -C $(SRCDIR) $(MARGS) INSTDIR=$(INSTDIR) -f Makefile
7272
$(POSTMAKE)
73-
@grep -q "^install:" $(SRCDIR)/Makefile && make -C $(SRCDIR) $(MIARGS) install || :
73+
@grep -q "^install:" $(SRCDIR)/Makefile && make -C $(SRCDIR) $(MIARGS) INSTDIR=$(INSTDIR) -f Makefile install || :
7474
@printf '# buildscripts generated dependency file\n$$(eval $$(call extlib_import_template,$(PRODUCT),$(VERSION)$(VPATCH),$(USELIB)))\n$(IMPORTEXTRA)\n' > $@
7575
@test -r $(LICENSEFILE) && { mkdir -p ${@D}/share ; cp $(LICENSEFILE) ${@D}/share/$(PRODUCT)-$(VERSION).license; } || :
7676
@echo Done

lib/wfrest/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
include ../extlib.mk
2+
3+
ifeq ($(ISWINDOWS),true)
4+
LDFLAGS:=-lregex -lws2_32
5+
else
6+
LDFLAGS:=-ldl -lrt
7+
endif
8+
9+
$(INSTDIR)/bin/%: $(PRJDIR)/%.cpp $(INSTDIR)/import.mk
10+
@echo "Adding extra macro to helpers..."
11+
@cat $(PRJDIR)/extra.h >> $(INSTDIR)/include/cppunit/extensions/HelperMacros.h
12+
@echo "Compiling ${<F}..."
13+
@mkdir -p ${@D}
14+
@g++ $< -o $@ -I$(INSTDIR)/include -L$(INSTDIR)/lib -lcppunit $(LDFLAGS)

lib/wfrest/extlib.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
VERSION:=0.9.8
2+
SRCURL=https://github.com/wfrest/wfrest/archive/refs/tags/v$(VERSION).tar.gz
3+
PRODUCT=wfrest
4+
LICENSEFILE=$(SRCDIR)/LICENSE

lib/wfrest/product.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
all:
3+
pwd
4+
mkdir -p build
5+
cd build ; cmake -DCMAKE_INSTALL_PREFIX=$(INSTDIR) -DWorkflow_DIR=../../workflow-0.11.9/ ..
6+
cd build ; make
7+
8+
install:
9+
cd build ; make install
10+

lib/workflow/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
include ../extlib.mk
2+
3+
ifeq ($(ISWINDOWS),true)
4+
LDFLAGS:=-lregex -lws2_32
5+
else
6+
LDFLAGS:=-ldl -lrt
7+
endif
8+
9+
$(INSTDIR)/bin/%: $(PRJDIR)/%.cpp $(INSTDIR)/import.mk
10+
@echo "Adding extra macro to helpers..."
11+
@cat $(PRJDIR)/extra.h >> $(INSTDIR)/include/cppunit/extensions/HelperMacros.h
12+
@echo "Compiling ${<F}..."
13+
@mkdir -p ${@D}
14+
@g++ $< -o $@ -I$(INSTDIR)/include -L$(INSTDIR)/lib -lcppunit $(LDFLAGS)

lib/workflow/extlib.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
VERSION:=0.11.9
2+
SRCURL=https://github.com/sogou/workflow/archive/refs/tags/v$(VERSION).tar.gz
3+
PRODUCT=workflow
4+
LICENSEFILE=$(SRCDIR)/LICENSE

lib/workflow/product.mk

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
all:
3+
pwd
4+
@echo "/////////////////////// build /////////////////////"
5+
@echo $(INSTDIR)
6+
mkdir -p build
7+
cd build ; cmake -DCMAKE_INSTALL_PREFIX=$(INSTDIR) ..
8+
cd build ; make Makefile
9+
10+
install:
11+
@echo "/////////////////////// install /////////////////////"
12+
cd build ; make install
13+

0 commit comments

Comments
 (0)