Libgourou Commit Details

Date:

2023-01-08 21:12:38 (8 months 14 days ago)

Author:

Grégory Soutadé

Branch:

master

Commit:

84b01a5de3a940d3d6dff2692234a229d6119625

Parents:

be78d242369e713c75be3bf70a9f10f2b8bcee46

Message:

Use system version of pugixml, not a checkouted one

Changes:

D	src/pugixml.cpp (full)
M	Makefile (2 diffs)
M	README.md (1 diff)
M	scripts/setup.sh (1 diff)
M	scripts/update_lib.sh (1 diff)
M	utils/Makefile (1 diff)

File differences

-7
8 8
9 9
10 
11 
10
11
12 12
13 13
14 14
... ...
48 48
49 49
50 50
51 
51
52 52
53 53
54 54
+␊
UPDFPARSERLIB = ./lib/updfparser/libupdfparser.a␊
␊
CXXFLAGS += -Wall -fPIC -I./include -I./lib/pugixml/src/ -I./lib/updfparser/include␊
LDFLAGS = $(UPDFPARSERLIB)␊
CXXFLAGS += -Wall -fPIC -I./include -I./usr/include/pugixml -I./lib/updfparser/include␊
LDFLAGS = $(UPDFPARSERLIB) -lpugixml␊
␊
VERSION     := $(shell cat include/libgourou.h |grep LIBGOUROU_VERSION|cut -d '"' -f2)␊
␊

SRCEXT      := cpp␊
OBJEXT      := o␊
␊
SOURCES      = src/libgourou.cpp src/user.cpp src/device.cpp src/fulfillment_item.cpp src/loan_token.cpp src/bytearray.cpp src/pugixml.cpp␊
SOURCES      = src/libgourou.cpp src/user.cpp src/device.cpp src/fulfillment_item.cpp src/loan_token.cpp src/bytearray.cpp␊
OBJECTS     := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.$(OBJEXT)))␊
␊
all: version lib obj $(TARGETS)␊
 ...
 ␊
 UPDFPARSERLIB = ./lib/updfparser/libupdfparser.a␊
 ␊
-CXXFLAGS += -Wall -fPIC -I./include -I./lib/pugixml/src/ -I./lib/updfparser/include␊
-LDFLAGS = $(UPDFPARSERLIB)␊
+CXXFLAGS += -Wall -fPIC -I./include -I./usr/include/pugixml -I./lib/updfparser/include␊
+LDFLAGS = $(UPDFPARSERLIB) -lpugixml␊
 ␊
 VERSION     := $(shell cat include/libgourou.h |grep LIBGOUROU_VERSION|cut -d '"' -f2)␊
 ␊
 SRCEXT      := cpp␊
 OBJEXT      := o␊
 ␊
-SOURCES      = src/libgourou.cpp src/user.cpp src/device.cpp src/fulfillment_item.cpp src/loan_token.cpp src/bytearray.cpp src/pugixml.cpp␊
+SOURCES      = src/libgourou.cpp src/user.cpp src/device.cpp src/fulfillment_item.cpp src/loan_token.cpp src/bytearray.cpp␊
 OBJECTS     := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.$(OBJEXT)))␊
 ␊
 all: version lib obj $(TARGETS)␊

-48
49 49
50 50
51
51 52
52 53
53 54
+  * libcurl␊
  * OpenSSL␊
  * libzip␊
  * libpugixml␊
␊
␊
Internal libraries are automatically fetched and statically compiled during the first run.␊
   * libcurl␊
   * OpenSSL␊
   * libzip␊
+  * libpugixml␊
 ␊
 ␊
 Internal libraries are automatically fetched and statically compiled during the first run.␊

-1
2 2
3 
4 
5 
6 
7 
8 
9 
10 
11 3
12 4
13 5
+#!/bin/bash␊
␊
# Pugixml␊
if [ ! -d lib/pugixml ] ; then␊
    git clone https://github.com/zeux/pugixml.git lib/pugixml␊
    pushd lib/pugixml␊
    git checkout latest␊
    popd␊
fi␊
␊
# uPDFParser␊
if [ ! -d lib/updfparser ] ; then␊
    git clone git://soutade.fr/updfparser.git lib/updfparser␊
 #!/bin/bash␊
 ␊
-# Pugixml␊
-if [ ! -d lib/pugixml ] ; then␊
-    git clone https://github.com/zeux/pugixml.git lib/pugixml␊
-    pushd lib/pugixml␊
-    git checkout latest␊
-    popd␊
-fi␊
-␊
 # uPDFParser␊
 if [ ! -d lib/updfparser ] ; then␊
     git clone git://soutade.fr/updfparser.git lib/updfparser␊

-1
2 2
3 
3
4 4
5 5
6 6
7 7
8 8
9 9
10 
11 
12 
13 
14 
15 10
16 11
17 12
+#!/bin/bash␊
␊
if [ ! -d lib/pugixml -o ! -d lib/updfparser ] ; then␊
if [ ! -d lib/updfparser ] ; then␊
    echo "Some libraries are missing"␊
    echo "You must run this script at the top of libgourou working direcotry."␊
    echo "./lib/setup.sh must be called first (make all)"␊
    exit 1␊
fi␊
␊
# Pugixml␊
pushd lib/pugixml␊
git pull origin latest␊
popd␊
␊
# uPDFParser␊
pushd lib/updfparser␊
git pull origin master␊
 #!/bin/bash␊
 ␊
-if [ ! -d lib/pugixml -o ! -d lib/updfparser ] ; then␊
+if [ ! -d lib/updfparser ] ; then␊
     echo "Some libraries are missing"␊
     echo "You must run this script at the top of libgourou working direcotry."␊
     echo "./lib/setup.sh must be called first (make all)"␊
     exit 1␊
 fi␊
 ␊
-# Pugixml␊
-pushd lib/pugixml␊
-git pull origin latest␊
-popd␊
-␊
 # uPDFParser␊
 pushd lib/updfparser␊
 git pull origin master␊

-5
6 6
7 7
8 
8
9 9
10 10
11 11
+CXXFLAGS=-Wall -fPIC -I$(ROOT)/include -I$(ROOT)/lib/pugixml/src/␊
␊
STATIC_DEP=␊
LDFLAGS += -L$(ROOT) -lcrypto -lzip -lz -lcurl␊
LDFLAGS += -L$(ROOT) -lcrypto -lzip -lz -lcurl -lpugixml␊
␊
ifneq ($(STATIC_UTILS),)␊
STATIC_DEP = $(ROOT)/libgourou.a␊
 CXXFLAGS=-Wall -fPIC -I$(ROOT)/include -I$(ROOT)/lib/pugixml/src/␊
 ␊
 STATIC_DEP=␊
-LDFLAGS += -L$(ROOT) -lcrypto -lzip -lz -lcurl␊
+LDFLAGS += -L$(ROOT) -lcrypto -lzip -lz -lcurl -lpugixml␊
 ␊
 ifneq ($(STATIC_UTILS),)␊
 STATIC_DEP = $(ROOT)/libgourou.a␊

Download the corresponding diff file

Libgourou

File differences

Branches

Tags