From 7bd066705ccf48e8ab136f3273a774bcf3022467 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 16 Apr 2019 12:43:59 -0400
Subject: [PATCH] Change gitian defaults back to elements, leave commented out
 lines as switch

---
 contrib/gitian-descriptors/gitian-linux.yml | 15 ++++++++++-----
 contrib/gitian-descriptors/gitian-osx.yml   | 14 +++++++++-----
 contrib/gitian-descriptors/gitian-win.yml   | 15 ++++++++++-----
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 3830e73995..66a19feb98 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -42,7 +42,9 @@ script: |
 
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
-  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests --enable-liquid"
+  #LIQUID BUILDS: Replace next line with following
+  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
+  #CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests --enable-liquid"
   FAKETIME_HOST_PROGS="gcc g++"
   FAKETIME_PROGS="date ar ranlib nm"
   HOST_CFLAGS="-O2 -g"
@@ -186,10 +188,13 @@ script: |
     find . -name "lib*.la" -delete
     find . -name "lib*.a" -delete
     rm -rf ${DISTNAME}/lib/pkgconfig
-    mv ${DISTNAME}/bin/elements-qt ${DISTNAME}/bin/liquid-qt
-    mv ${DISTNAME}/bin/elements-cli ${DISTNAME}/bin/liquid-cli
-    mv ${DISTNAME}/bin/elementsd ${DISTNAME}/bin/liquidd
-    mv ${DISTNAME}/bin/elements-tx ${DISTNAME}/bin/liquid-tx
+
+    # LIQUID: Uncomment next few lines
+    #mv ${DISTNAME}/bin/elements-qt ${DISTNAME}/bin/liquid-qt
+    #mv ${DISTNAME}/bin/elements-cli ${DISTNAME}/bin/liquid-cli
+    #mv ${DISTNAME}/bin/elementsd ${DISTNAME}/bin/liquidd
+    #mv ${DISTNAME}/bin/elements-tx ${DISTNAME}/bin/liquid-tx
+
     find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
     find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
     cp ../doc/README.md ${DISTNAME}/
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index d7cf13c978..927047d391 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -36,7 +36,9 @@ files:
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-apple-darwin14"
-  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --enable-liquid GENISOIMAGE=$WRAP_DIR/genisoimage"
+  #LIQUID BUILDS: Replace next line with following
+  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
+  #CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --enable-liquid GENISOIMAGE=$WRAP_DIR/genisoimage"
   FAKETIME_HOST_PROGS=""
   FAKETIME_PROGS="ar ranlib date dmg genisoimage"
 
@@ -161,10 +163,12 @@ script: |
     ${WRAP_DIR}/dmg dmg "${OSX_VOLNAME}.dmg" ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg
 
     cd installed
-    mv ${DISTNAME}/bin/elements-qt ${DISTNAME}/bin/liquid-qt
-    mv ${DISTNAME}/bin/elements-cli ${DISTNAME}/bin/liquid-cli
-    mv ${DISTNAME}/bin/elementsd ${DISTNAME}/bin/liquidd
-    mv ${DISTNAME}/bin/elements-tx ${DISTNAME}/bin/liquid-tx
+
+    # LIQUID: Uncomment next few lines
+    #mv ${DISTNAME}/bin/elements-qt ${DISTNAME}/bin/liquid-qt
+    #mv ${DISTNAME}/bin/elements-cli ${DISTNAME}/bin/liquid-cli
+    #mv ${DISTNAME}/bin/elementsd ${DISTNAME}/bin/liquidd
+    #mv ${DISTNAME}/bin/elements-tx ${DISTNAME}/bin/liquid-tx
 
     find ${DISTNAME} | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
     cd ../../
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index db34dfc8da..a4fe185dfb 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -32,7 +32,9 @@ files: []
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
-  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --enable-liquid"
+  #LIQUID BUILDS: Replace next line with following
+  CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
+  #CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --enable-liquid"
   FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"
   HOST_CFLAGS="-O2 -g"
@@ -166,10 +168,13 @@ script: |
     rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
     cp -f elements-*setup*.exe $OUTDIR/
     cd installed
-    mv ${DISTNAME}/bin/elements-qt.exe ${DISTNAME}/bin/liquid-qt.exe
-    mv ${DISTNAME}/bin/elements-cli.exe ${DISTNAME}/bin/liquid-cli.exe
-    mv ${DISTNAME}/bin/elementsd.exe ${DISTNAME}/bin/liquidd.exe
-    mv ${DISTNAME}/bin/elements-tx.exe ${DISTNAME}/bin/liquid-tx.exe
+
+    # LIQUID: Uncomment next few lines
+    #mv ${DISTNAME}/bin/elements-qt.exe ${DISTNAME}/bin/liquid-qt.exe
+    #mv ${DISTNAME}/bin/elements-cli.exe ${DISTNAME}/bin/liquid-cli.exe
+    #mv ${DISTNAME}/bin/elementsd.exe ${DISTNAME}/bin/liquidd.exe
+    #mv ${DISTNAME}/bin/elements-tx.exe ${DISTNAME}/bin/liquid-tx.exe
+
     find ${DISTNAME}/bin -type f -executable -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
     find ${DISTNAME} -not -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
     find ${DISTNAME} -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}-debug.zip