tjh.dev
1Submodule libretroshare contains modified content
2diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
3index 923f878c..ef00f3d7 100644
4--- a/libretroshare/src/libretroshare.pro
5+++ b/libretroshare/src/libretroshare.pro
6@@ -930,20 +930,14 @@ rs_jsonapi {
7 genrestbedlib.variable_out = PRE_TARGETDEPS
8 win32-g++:isEmpty(QMAKE_SH) {
9 genrestbedlib.commands = \
10- cd /D $$shell_path($${RS_SRC_PATH}) && git submodule update --init supportlibs/restbed || cd . $$escape_expand(\\n\\t) \
11- cd /D $$shell_path($${RESTBED_SRC_PATH}) && git submodule update --init dependency/asio || cd . $$escape_expand(\\n\\t) \
12- cd /D $$shell_path($${RESTBED_SRC_PATH}) && git submodule update --init dependency/catch || cd . $$escape_expand(\\n\\t )\
13- cd /D $$shell_path($${RESTBED_SRC_PATH}) && git submodule update --init dependency/kashmir || cd . $$escape_expand(\\n\\t) \
14+ cd /D $$shell_path($${RS_SRC_PATH}) && cd . $$escape_expand(\\n\\t) \
15+ cd /D $$shell_path($${RESTBED_SRC_PATH}) && cd . $$escape_expand(\\n\\t) \
16+ cd /D $$shell_path($${RESTBED_SRC_PATH}) && cd . $$escape_expand(\\n\\t )\
17+ cd /D $$shell_path($${RESTBED_SRC_PATH}) && cd . $$escape_expand(\\n\\t) \
18 $(CHK_DIR_EXISTS) $$shell_path($$UDP_DISCOVERY_BUILD_PATH) $(MKDIR) $$shell_path($${UDP_DISCOVERY_BUILD_PATH}) $$escape_expand(\\n\\t)
19 } else {
20 genrestbedlib.commands = \
21- cd $${RS_SRC_PATH} && ( \
22- git submodule update --init supportlibs/restbed ; \
23- cd $${RESTBED_SRC_PATH} ; \
24- git submodule update --init dependency/asio ; \
25- git submodule update --init dependency/catch ; \
26- git submodule update --init dependency/kashmir ; \
27- true ) && \
28+ cd $${RS_SRC_PATH} && \
29 mkdir -p $${RESTBED_BUILD_PATH} &&
30 }
31 genrestbedlib.commands += \
32@@ -1063,14 +1057,9 @@ rs_broadcast_discovery {
33 udpdiscoverycpplib.variable_out = PRE_TARGETDEPS
34 win32-g++:isEmpty(QMAKE_SH) {
35 udpdiscoverycpplib.commands = \
36- cd /D $$shell_path($${RS_SRC_PATH}) && git submodule update --init supportlibs/udp-discovery-cpp || cd . $$escape_expand(\\n\\t) \
37 $(CHK_DIR_EXISTS) $$shell_path($$UDP_DISCOVERY_BUILD_PATH) $(MKDIR) $$shell_path($${UDP_DISCOVERY_BUILD_PATH}) $$escape_expand(\\n\\t)
38 } else {
39- udpdiscoverycpplib.commands = \
40- cd $${RS_SRC_PATH} && ( \
41- git submodule update --init supportlibs/udp-discovery-cpp || \
42- true ) && \
43- mkdir -p $${UDP_DISCOVERY_BUILD_PATH} &&
44+ udpdiscoverycpplib.commands = mkdir -p $${UDP_DISCOVERY_BUILD_PATH} &&
45 }
46 udpdiscoverycpplib.commands += \
47 cd $$shell_path($${UDP_DISCOVERY_BUILD_PATH}) && \
48@@ -1106,15 +1095,13 @@ rs_sam3_libsam3 {
49 win32-g++:isEmpty(QMAKE_SH) {
50 LIBSAM3_MAKE_PARAMS = CC=gcc
51 libsam3.commands = \
52- cd /D $$shell_path($${RS_SRC_PATH}) && git submodule update --init supportlibs/libsam3 || cd . $$escape_expand(\\n\\t) \
53+ cd /D $$shell_path($${RS_SRC_PATH}) && cd . $$escape_expand(\\n\\t) \
54 $(CHK_DIR_EXISTS) $$shell_path($$LIBSAM3_BUILD_PATH) $(MKDIR) $$shell_path($${LIBSAM3_BUILD_PATH}) $$escape_expand(\\n\\t) \
55 $(COPY_DIR) $$shell_path($${LIBSAM3_SRC_PATH}) $$shell_path($${LIBSAM3_BUILD_PATH}) || cd . $$escape_expand(\\n\\t)
56 } else {
57 LIBSAM3_MAKE_PARAMS =
58 libsam3.commands = \
59- cd $${RS_SRC_PATH} && ( \
60- git submodule update --init supportlibs/libsam3 || \
61- true ) && \
62+ cd $${RS_SRC_PATH} && \
63 mkdir -p $${LIBSAM3_BUILD_PATH} && \
64 (cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} || true) &&
65 }
66diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
67index d73117b84..b2fc6799a 100644
68--- a/retroshare-gui/src/retroshare-gui.pro
69+++ b/retroshare-gui/src/retroshare-gui.pro
70@@ -66,10 +66,7 @@ rs_gui_cmark {
71 gencmarklib.CONFIG += target_predeps combine
72 gencmarklib.variable_out = PRE_TARGETDEPS
73 gencmarklib.commands = \
74- cd $${RS_SRC_PATH} && ( \
75- git submodule update --init supportlibs/cmark ; \
76- cd $${CMARK_SRC_PATH} ; \
77- true ) && \
78+ cd $${RS_SRC_PATH} && \
79 mkdir -p $${CMARK_BUILD_PATH} && cd $${CMARK_BUILD_PATH} && \
80 cmake \
81 -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \