cd: further fixes

gridcoin-community · Aug 7, 2021 · d27d292 · d27d292
1 parent f55ff04
commit d27d292
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 35 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -128,7 +128,7 @@ $(OSX_TEMP_ISO): $(APP_DIST_EXTRAS)
 $(OSX_DMG): $(OSX_TEMP_ISO)
 	$(MKDIR_P) $(top_builddir)/release
 	$(DMG) dmg "$<" "$@"
-	@mv $@ $(top_builddir)/release/$@
+	@mv $@ $(top_builddir)/release/$(PACKAGE)-$(PACKAGE_VERSION)-macos.dmg
 
 dpi%.$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_SVG)
 	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d $* -p $* | $(IMAGEMAGICK_CONVERT) - $@

diff --git a/cd/00_setup_env_mac.sh b/cd/00_setup_env_mac.sh
@@ -12,7 +12,4 @@ export HOST=x86_64-apple-darwin18
 export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso"
 export XCODE_VERSION=12.1
 export XCODE_BUILD_ID=12A7403
-export RUN_UNIT_TESTS=false
-export RUN_FUNCTIONAL_TESTS=false
-export GOAL="deploy"
 export GRIDCOIN_CONFIG="--with-gui --enable-reduce-exports"
diff --git a/cd/00_setup_env_win32.sh b/cd/00_setup_env_win32.sh
@@ -10,10 +10,6 @@ export CONTAINER_NAME=ci_win32
 export DOCKER_NAME_TAG=ubuntu:20.04
 export HOST=i686-w64-mingw32
 export PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32"
-export RUN_UNIT_TESTS=false
-export RUN_FUNCTIONAL_TESTS=false
-# export RUN_SECURITY_TESTS="true"
 export GOAL="deploy"
 export GRIDCOIN_CONFIG="--enable-reduce-exports --with-gui=qt5"
 export DPKG_ADD_ARCH="i386"
-export NEED_XVFB="false"
diff --git a/cd/00_setup_env_win64.sh b/cd/00_setup_env_win64.sh
@@ -10,7 +10,4 @@ export CONTAINER_NAME=ci_win64
 export DOCKER_NAME_TAG=ubuntu:20.04
 export HOST=x86_64-w64-mingw32
 export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
-export GOAL="deploy"
 export GRIDCOIN_CONFIG="--enable-reduce-exports --with-gui=qt5"
-export RUN_UNIT_TESTS=false
-export NEED_XVFB="false"
diff --git a/cd/04_install.sh b/cd/04_install.sh
@@ -59,9 +59,6 @@ elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
   BEGIN_FOLD apt
   ${CI_RETRY_EXE} DOCKER_EXEC apt-get update
   ${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES
-  if [ "$NEED_XVFB" == "true" ]; then
-    ${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y xvfb
-  fi
   END_FOLD
 fi
 

diff --git a/cd/06_script_a.sh b/cd/06_script_a.sh
@@ -9,33 +9,23 @@ export LC_ALL=C.UTF-8
 GRIDCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
 DOCKER_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
 
+DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}/gridcoin-$HOST"
+export P_CI_DIR="${BASE_BUILD_DIR}/gridcoin-$HOST"
+
 BEGIN_FOLD autogen
 if [ -n "$CONFIG_SHELL" ]; then
-  DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh"
+  DOCKER_EXEC "$CONFIG_SHELL" -c "{BASE_ROOT_DIR}/autogen.sh"
 else
-  DOCKER_EXEC ./autogen.sh
+  DOCKER_EXEC ${BASE_ROOT_DIR}/autogen.sh
 fi
 END_FOLD
 
-DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}"
-export P_CI_DIR="${BASE_BUILD_DIR}"
-
-BEGIN_FOLD configure
-DOCKER_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache $GRIDCOIN_CONFIG_ALL $GRIDCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
-END_FOLD
-
-BEGIN_FOLD distdir
-DOCKER_EXEC make distdir VERSION=$HOST
-END_FOLD
-
-export P_CI_DIR="${BASE_BUILD_DIR}/gridcoin-$HOST"
-
 BEGIN_FOLD configure
-DOCKER_EXEC ./configure --cache-file=../config.cache $GRIDCOIN_CONFIG_ALL $GRIDCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
+DOCKER_EXEC ${BASE_ROOT_DIR}/configure $GRIDCOIN_CONFIG_ALL $GRIDCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
 END_FOLD
 
 BEGIN_FOLD build
-DOCKER_EXEC make $MAKEJOBS deploy || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
+DOCKER_EXEC make $MAKEJOBS deploy || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make deploy V=1 ; false )
 END_FOLD
 
 BEGIN_FOLD cache_stats

diff --git a/configure.ac b/configure.ac
@@ -1193,7 +1193,6 @@ AC_SUBST(QR_LIBS)
 AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist])
 AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
 AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
-AC_CONFIG_LINKS([CHANGELOG.md:CHANGELOG.md COPYING:COPYING])
 
 dnl boost's m4 checks do something really nasty: they export these vars. As a
 dnl result, they leak into secp256k1's configure and crazy things happen.

diff --git a/share/setup.nsi.in b/share/setup.nsi.in
@@ -51,7 +51,7 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe
+OutFile @abs_top_builddir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe
 !if "@WINDOWS_BITS@" == "64"
 InstallDir $PROGRAMFILES64\GridcoinResearch
 !else
@@ -76,9 +76,9 @@ ShowUninstDetails show
 Section -Main SEC0000
     SetOutPath $INSTDIR
     SetOverwrite on
-    File @abs_top_srcdir@/release/@GRIDCOIN_GUI_NAME@@EXEEXT@
+    File @abs_top_builddir@/release/@GRIDCOIN_GUI_NAME@@EXEEXT@
     SetOutPath $INSTDIR\daemon
-    File @abs_top_srcdir@/release/@GRIDCOIN_DAEMON_NAME@@EXEEXT@
+    File @abs_top_builddir@/release/@GRIDCOIN_DAEMON_NAME@@EXEEXT@
     SetOutPath $INSTDIR\doc
     File /oname=COPYING.txt @abs_top_srcdir@/COPYING
     File /oname=CHANGELOG.md @abs_top_srcdir@/CHANGELOG.md