Merge branch 'FSM' into jl777

.gitlab-ci.yml

@@ -40,6 +40,7 @@ build:ubuntu:
   - mkdir ${PACKAGE_DIR_LINUX}
   - cp src/komodod
     src/komodo-cli
+    zcutil/fetch-params.sh
     ${PACKAGE_DIR_LINUX}
   - chmod +x ${PACKAGE_DIR_LINUX}/komodod
   - chmod +x ${PACKAGE_DIR_LINUX}/komodo-cli
@@ -71,10 +72,8 @@ build:windows:
   - cp src/komodod.exe
     src/komodo-cli.exe
     src/komodo-tx.exe
-    src/cc/rogue/rogue.exe
+    zcutil/wget64.exe
     zcutil/fetch-params.bat
-    src/cc/rogue/x86_64-w64-mingw32/bin/libcurl-4.dll
-    src/cc/rogue/x86_64-w64-mingw32/bin/libncursesw6.dll
     ${PACKAGE_DIR_WINDOWS}
   - zip -r ${PACKAGE_DIR_WINDOWS}.zip ${PACKAGE_DIR_WINDOWS}
   - md5sum ${AGAMA_ARTIFACTS_WINDOWS} > ${AGAMA_ARTIFACTS_WINDOWS_CHECKSUM}

src/cc/Makefile_custom

@@ -0,0 +1,38 @@
+SHELL		= /bin/sh
+CC		= gcc
+CC_DARWIN	= g++-8
+CC_WIN		= x86_64-w64-mingw32-gcc-posix
+CFLAGS_DARWIN	= -DBUILD_CUSTOMCC -std=c++11 -arch x86_64 -I../secp256k1/include -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -Wl,-undefined -Wl,dynamic_lookup -Wno-write-strings -shared -dynamiclib
+CFLAGS		= -Wno-write-strings -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared
+CFLAGS_WIN	= -Wno-write-strings -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../../depends/x86_64-w64-mingw32/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared
+DEBUGFLAGS	= -O0 -D _DEBUG
+RELEASEFLAGS	= -O2 -D NDEBUG -combine -fwhole-program
+$(info $(OS))
+OS := $(shell uname -s)
+$(info $(OS))
+TARGET  = customcc.so
+TARGET_DARWIN = customcc.dylib
+TARGET_WIN = customcc.dll
+SOURCES = cclib.cpp
+#HEADERS = $(shell echo ../cryptoconditions/include/*.h) -I/usr/local/Cellar/gcc\@8/8.3.0/include/c++/8.3.0/
+
+all: $(TARGET)
+
+$(TARGET): $(SOURCES)
+	$(info Building cclib to src/)
+ifeq ($(OS),Darwin)
+	$(CC_DARWIN) $(CFLAGS_DARWIN) $(DEBUGFLAGS) -o $(TARGET_DARWIN) -c $(SOURCES)
+	cp $(TARGET_DARWIN) ../libcc.dylib
+else ifeq ($(HOST),x86_64-w64-mingw32)
+	$(info WINDOWS)
+	$(CC_WIN) $(CFLAGS_WIN) $(DEBUGFLAGS) -o $(TARGET_WIN) -c $(SOURCES)
+	cp $(TARGET_WIN) ../libcc.dll
+#else ifeq ($(WIN_HOST),True) - todo: pass ENV var from build.sh if WIN host
+else
+	$(info LINUX)
+	$(CC) $(CFLAGS) $(DEBUGFLAGS) -o $(TARGET) -c $(SOURCES)
+	cp $(TARGET) ../libcc.so
+endif
+
+clean:
+	rm -rf $(TARGET)

src/cc/makecustom

@@ -1,6 +1,7 @@
 #!/bin/sh
-gcc -O3 -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o customcc.so cclib.cpp
-cp customcc.so ../libcc.so
-cd ..
-make
-cd cc
+if make -f Makefile_custom "$@"; then
+  echo CUSTOMCC BUILD SUCCESSFUL
+else
+  echo CUSTOMCC BUILD FAILED
+  exit 1
+fi

zcutil/build-mac.sh

@@ -47,7 +47,7 @@ make "$@" -C ./depends/ V=1 NO_QT=1 NO_PROTON=1
 WD=$PWD
 cd src/cc
 echo $PWD
-./makerogue
+./makecustom
 cd $WD
 
 ./autogen.sh

zcutil/build-win.sh

@@ -14,7 +14,7 @@ cd ../
 WD=$PWD
 cd src/cc
 echo $PWD
-./makerogue
+./makecustom
 cd $WD
 
 ./autogen.sh

zcutil/build.sh

@@ -106,7 +106,7 @@ CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG"
 WD=$PWD
 cd src/cc
 echo $PWD
-./makerogue
+./makecustom
 cd $WD
 
 "$MAKE" "$@" V=1