From f7b92692924e7f05e68aea80a77d86ff45f7db69 Mon Sep 17 00:00:00 2001 From: xanimo Date: Fri, 6 Sep 2024 17:20:58 -0700 Subject: [PATCH 1/2] build: remove clean-local from build and run scripts --- contrib/scripts/build.sh | 1 - contrib/scripts/run.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/scripts/build.sh b/contrib/scripts/build.sh index 4c9d607cd..cdb9a9486 100755 --- a/contrib/scripts/build.sh +++ b/contrib/scripts/build.sh @@ -43,7 +43,6 @@ fi if [ -d "`pwd`/.libs" ]; then rm -rf "`pwd`/.libs" make clean - make clean-local fi if has_param '--host' "$@"; then diff --git a/contrib/scripts/run.sh b/contrib/scripts/run.sh index 51124edf2..6f5ac101f 100755 --- a/contrib/scripts/run.sh +++ b/contrib/scripts/run.sh @@ -51,7 +51,6 @@ if [[ "$TARGET_HOST_TRIPLET" == "" && "$ALL_HOST_TRIPLETS" != "" ]]; then FILE=Makefile if test -f "$FILE"; then make clean - make clean-local fi CLEAN=1 fi From c984bf0d13581ab9668b79c1ecfe419202d9fc52 Mon Sep 17 00:00:00 2001 From: xanimo Date: Fri, 6 Sep 2024 17:00:06 -0700 Subject: [PATCH 2/2] fixate 0.1.4-dogebox-pre --- CMakeLists.txt | 4 ++-- configure.ac | 4 ++-- contrib/gitian-descriptors/gitian-linux.yml | 6 +++--- contrib/gitian-descriptors/gitian-osx.yml | 6 +++--- contrib/gitian-descriptors/gitian-win.yml | 10 +++++----- include/dogecoin/version.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4a69c6bc..fc972323b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ SET(CMAKE_C_STANDARD 99) SET(CMAKE_C_STANDARD_REQUIRED TRUE) SET(LIBDOGECOIN_NAME dogecoin) -PROJECT(lib${LIBDOGECOIN_NAME} VERSION 0.1.3) +PROJECT(lib${LIBDOGECOIN_NAME} VERSION "0.1.4") option(BUILD_SHARED_LIBS "Build the shared library" OFF) if(BUILD_SHARED_LIBS) @@ -116,7 +116,7 @@ endif() ADD_DEFINITIONS( -DPACKAGE_NAME="${PROJECT_NAME}" - -DPACKAGE_VERSION="${PROJECT_VERSION}" + -DPACKAGE_VERSION="${PROJECT_VERSION}-dogebox-pre" -DRANDOM_DEVICE="${RANDOM_DEVICE}" ) IF(BUILD_SHARED_LIBS) diff --git a/configure.ac b/configure.ac index f3c3913d4..8d50f9c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.68]) define(_PKG_VERSION_MAJOR, 0) define(_PKG_VERSION_MINOR, 1) define(_PKG_VERSION_BUILD, 4) -define(_PKG_VERSION_IS_RELEASE, false) +define(_PKG_VERSION_IS_RELEASE, true) # The library version is based on libtool versioning of the ABI. The set of # rules for updating the version can be found here: @@ -17,7 +17,7 @@ define(_PKG_VERSION_IS_RELEASE, false) define(_LIB_VERSION_CURRENT, 1) define(_LIB_VERSION_REVISION, 0) define(_LIB_VERSION_AGE, 0) -AC_INIT([libdogecoin],m4_join([.], _PKG_VERSION_MAJOR, _PKG_VERSION_MINOR, _PKG_VERSION_BUILD)m4_if(_PKG_VERSION_IS_RELEASE, [true], [], [-dev]),[https://github.com/dogecoinfoundation/libdogecoin/issues],[libdogecoin],[https://github.com/dogecoinfoundation/libdogecoin]) +AC_INIT([libdogecoin],m4_join([.], _PKG_VERSION_MAJOR, _PKG_VERSION_MINOR, _PKG_VERSION_BUILD)m4_if(_PKG_VERSION_IS_RELEASE, [true], [-dogebox-pre], [-dev]),[https://github.com/dogecoinfoundation/libdogecoin/issues],[libdogecoin],[https://github.com/dogecoinfoundation/libdogecoin]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 3c353af6c..d371d235a 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "libdogecoin-linux-0.1.4" +name: "libdogecoin-linux-0.1.4-dogebox-pre" enable_cache: true suites: - "focal" @@ -128,7 +128,7 @@ script: | # Create the release tarball using (arbitrarily) the first host ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ - git archive --format=tar --prefix=libdogecoin-0.1.4/ HEAD | gzip -9n > libdogecoin-0.1.4.tar.gz + git archive --format=tar --prefix=libdogecoin-0.1.4-dogebox-pre/ HEAD | gzip -9n > libdogecoin-0.1.4-dogebox-pre.tar.gz SOURCEDIST=`echo libdogecoin-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order @@ -143,7 +143,7 @@ script: | for i in ${HOSTS}; do export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH} ./contrib/scripts/build.sh --host ${i} --depends - ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.4" + ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.4-dogebox-pre" done # Move them to gitian-builder/build/out/src diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index b065c8521..d5b2d20de 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "libdogecoin-osx-0.1.4" +name: "libdogecoin-osx-0.1.4-dogebox-pre" enable_cache: true suites: - "focal" @@ -98,7 +98,7 @@ script: | # Create the release tarball using (arbitrarily) the first host ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ - git archive --format=tar --prefix=libdogecoin-0.1.4/ HEAD | gzip -9n > libdogecoin-0.1.4.tar.gz + git archive --format=tar --prefix=libdogecoin-0.1.4-dogebox-pre/ HEAD | gzip -9n > libdogecoin-0.1.4-dogebox-pre.tar.gz SOURCEDIST=`echo libdogecoin-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order @@ -113,7 +113,7 @@ script: | for i in ${HOSTS}; do export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH} ./contrib/scripts/build.sh --host ${i} --depends - ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.4" + ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.4-dogebox-pre" done # Move them to gitian-builder/build/out/src diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index bdbe82f8f..618b0a5bf 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "libdogecoin-win-0.1.4" +name: "libdogecoin-win-0.1.4-dogebox-pre" enable_cache: true suites: - "focal" @@ -115,7 +115,7 @@ script: | # Create the release tarball using (arbitrarily) the first host ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ - git archive --format=tar --prefix=libdogecoin-0.1.4/ HEAD | gzip -9n > libdogecoin-0.1.4.tar.gz + git archive --format=tar --prefix=libdogecoin-0.1.4-dogebox-pre/ HEAD | gzip -9n > libdogecoin-0.1.4.tar.gz SOURCEDIST=`echo libdogecoin-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order @@ -123,7 +123,7 @@ script: | pushd temp tar xf ../$SOURCEDIST find libdogecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST - tar tf ../$SOURCEDIST | zip -X@ ../libdogecoin-0.1.4.zip + tar tf ../$SOURCEDIST | zip -X@ ../libdogecoin-0.1.4-dogebox-pre.zip popd ORIGPATH="$PATH" @@ -131,10 +131,10 @@ script: | for i in ${HOSTS}; do export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH} ./contrib/scripts/build.sh --host ${i} --depends - ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.4" + ./contrib/scripts/pack.sh --host=${i} --prefix=build --commit="0.1.4-dogebox-pre" done # Move them to gitian-builder/build/out/src - mv libdogecoin-0.1.4.zip `pwd`/output + mv libdogecoin-0.1.4-dogebox-pre.zip `pwd`/output mkdir -p $OUTDIR/src mv ~/build/libdogecoin/output/*.zip $OUTDIR/src diff --git a/include/dogecoin/version.h b/include/dogecoin/version.h index 1e3cee3b6..056e901e8 100644 --- a/include/dogecoin/version.h +++ b/include/dogecoin/version.h @@ -39,7 +39,7 @@ LIBDOGECOIN_BEGIN_DECL //! These need to be macros, as version.c's voodoo requires it #define _PKG_VERSION_MAJOR 0 #define _PKG_VERSION_MINOR 1 -#define _PKG_VERSION_BUILD 3 +#define _PKG_VERSION_BUILD 4 #define _LIB_VERSION_REVISION 0 static const int CLIENT_VERSION =