[Travis] refs #72 Added submodule in cmd

fibercrypto · Oct 7, 2019 · 284d1f6 · 284d1f6
1 parent fd8a248
commit 284d1f6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ matrix:
       dotnet: 2.2.401
 
 before_install:
+  - bash ./.travis/change_submodule.sh
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash .travis/install_linux.sh ; fi
   - ./.travis/install-deps.sh
   - ./.travis/install-travis-gcc.sh

diff --git a/.travis/change_submodule.sh b/.travis/change_submodule.sh
@@ -0,0 +1 @@
+(cd $PATH_SUBMODULE && git remote add simelo https://github.com/simelo/libskycoin && git fetch simelo stdevHan_t105_update_submodule_0.27.0 && git checkout stdevHan_t105_update_submodule_0.27.0 && git submodule update --recursive )
diff --git a/Makefile b/Makefile
@@ -91,12 +91,12 @@ build-libc: configure ## Build libskycoin C client library
 build-swig: ## Generate C# C module from SWIG interfaces
 	#Generate structs.i from skytypes.gen.h
 	rm -f $(CSHARP_SWIG_DIR)/structs.i
-	cp $(INCLUDE_DIR)/skytypes.gen.h $(CSHARP_SWIG_DIR)/structs.i
+	cp $(INCLUDE_DIR)/skytypes.gen.h $(CSHARP_SWIG_DIR)/include/structs.i
 	{ \
 		if [[ "$$(uname -s)" == "Darwin" ]]; then \
-			sed -i '.kbk' 's/#/%/g' $(CSHARP_SWIG_DIR)/structs.i ;\
+			sed -i '.kbk' 's/#/%/g' $(CSHARP_SWIG_DIR)/include/structs.i ;\
 		else \
-			sed -i 's/#/%/g' $(CSHARP_SWIG_DIR)/structs.i ;\
+			sed -i 's/#/%/g' $(CSHARP_SWIG_DIR)/include/structs.i ;\
 		fi \
 	}
 	mkdir -p $(CSHARP_SWIG_DIR)/LibskycoinNet/skycoin

diff --git a/lib/swig/structs.i b/lib/swig/structs.i
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(cd $PATH_SUBMODULE && git remote add simelo https://github.com/simelo/libskycoin && git fetch simelo stdevHan_t105_update_submodule_0.27.0 && git checkout stdevHan_t105_update_submodule_0.27.0 && git submodule update --recursive )