From 1c3c10281e4e16a73e1e2fe70ef6752c0d3f26d8 Mon Sep 17 00:00:00 2001 From: expertmm Date: Tue, 5 Dec 2017 01:42:24 -0500 Subject: [PATCH] bumped version --- HowTo-expertmm.md | 2 +- bindings/python/setup.py | 2 +- build.sh | 12 +++++++++++- configure.ac | 2 +- doc/changelog.txt | 6 ++++++ doc/doxygen/audiere-devel.doxy | 2 +- doc/doxygen/audiere-users.doxy | 2 +- doc/doxygen/doxygen-dist.sh | 2 +- doc/doxygen/mainpage.doxy | 2 +- doc/release-howto.txt | 12 ++++++------ full-release.sh | 2 +- make-release-sgi.sh | 2 +- make-release-win32.sh | 2 +- src/audiere.h | 2 +- src/audiere.rc | 8 ++++---- src/version.cpp | 2 +- 16 files changed, 39 insertions(+), 23 deletions(-) diff --git a/HowTo-expertmm.md b/HowTo-expertmm.md index c405874..c97313c 100644 --- a/HowTo-expertmm.md +++ b/HowTo-expertmm.md @@ -12,7 +12,7 @@ and and ## Compiling on Windows with MSVC in 32-bit and 64-bit -* You should probably use scons under cygwin (correct me if I'm wrong). +* You should probably use scons under cygwin (correct me if I'm wrong at https://github.com/expertmm/Audiere). * see MSVC 32-bit/64-bit builds at: https://github.com/SethRobinson/Audiere (eventually those changes will be merged into this fork hopefully) see also README.md at https://github.com/expertmm/Audiere diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 39222ef..502aacb 100755 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -13,7 +13,7 @@ libraries = libs) setup(name = 'audiere', - version = '1.9.4', + version = '1.10.1', description = 'A high-level audio API.', url = 'http://audiere.sourceforge.net/', ext_modules = [ ext ]) diff --git a/build.sh b/build.sh index a649206..aed23a5 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,14 @@ #!/bin/sh #cd "`dirname \"$0\"`" echo "WARNING: Using scons doesn't add version nor install (which is normal for Windows). Consider using full-release.sh instead for cross-platform build." -C:/Python26/python.exe third-party/scons.py +this_python2_path=C:/Python26/python.exe +if [ ! -f "$this_python2_path" ]; then + if [ -f "C:/Python26/python.exe" ]; then + this_python2_path="C:/Python27/python.exe" + fi +fi +if [ -f "$this_python2_path" ]; then + "$this_python2_path" third-party/scons.py +else + echo "Build using scons failed since expected cygwin on Windows where python 2.6 or 2.7 is installed so as to provide an executable path such as $this_python2_path" +fi diff --git a/configure.ac b/configure.ac index 6d7c7e3..b72b2a2 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(config) AC_CANONICAL_SYSTEM -VERSION=1.9.4 +VERSION=1.10.1 PACKAGE="audiere" AC_SUBST(VERSION) diff --git a/doc/changelog.txt b/doc/changelog.txt index ff3f153..44f0ba7 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -1,3 +1,9 @@ +2017.12.05 + + 1.10.1 released. + + Restored the former build process: ./full-release.sh which now works on linux not just Cygwin (fixed the script as well as minor/dependent build scripts: bootstrap, build.sh, doxygen-dist.sh). + 2017.12.03 expertmm's fork started at https://github.com/expertmm/Audiere from https://github.com/vancegroup/Audiere diff --git a/doc/doxygen/audiere-devel.doxy b/doc/doxygen/audiere-devel.doxy index 2b71f42..f3a8875 100755 --- a/doc/doxygen/audiere-devel.doxy +++ b/doc/doxygen/audiere-devel.doxy @@ -23,7 +23,7 @@ PROJECT_NAME = audiere # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.9.4 +PROJECT_NUMBER = 1.10.1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/doxygen/audiere-users.doxy b/doc/doxygen/audiere-users.doxy index bf25bed..38fb394 100755 --- a/doc/doxygen/audiere-users.doxy +++ b/doc/doxygen/audiere-users.doxy @@ -23,7 +23,7 @@ PROJECT_NAME = audiere # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.9.4 +PROJECT_NUMBER = 1.10.1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/doxygen/doxygen-dist.sh b/doc/doxygen/doxygen-dist.sh index 1747338..b31b2a3 100755 --- a/doc/doxygen/doxygen-dist.sh +++ b/doc/doxygen/doxygen-dist.sh @@ -19,7 +19,7 @@ die() { } archive() { - VERSION=1.9.4 + VERSION=1.10.1 AUDIENCE=$1 BASE=audiere-$VERSION-$AUDIENCE-doxygen diff --git a/doc/doxygen/mainpage.doxy b/doc/doxygen/mainpage.doxy index 475d059..67115ff 100644 --- a/doc/doxygen/mainpage.doxy +++ b/doc/doxygen/mainpage.doxy @@ -1,4 +1,4 @@ -/** @mainpage Audiere 1.9.4 +/** @mainpage Audiere 1.10.1 Audiere is a high-level, straightforward, and portable audio API. diff --git a/doc/release-howto.txt b/doc/release-howto.txt index f97ff19..c244cab 100644 --- a/doc/release-howto.txt +++ b/doc/release-howto.txt @@ -1,4 +1,4 @@ -Bump the Version Number +Bump the Version Number (using Semantic Versioning) The following files contain version information: configure.in @@ -12,19 +12,20 @@ Bump the Version Number doc/doxygen/mainpage.doxy src/audiere.h src/audiere.rc + - in at least 4 places (including 2 in comma-separated form)! src/version.cpp - -Add "$VERSION release" to changelog. +Add "$VERSION released." to changelog. Run tests with wxPlayer!!! +NOTE: all build steps below seem to be done by full-release.sh now (correct me if I'm wrong: https://github.com/expertmm/Audiere) Build the VC6 Binary Release Build UNIX Release Build Doxygen Releases -Build CVS snapshot tarball +Build git version # formerly: Build CVS snapshot tarball *) Run full-release.sh @@ -33,8 +34,7 @@ Build the SGI Binary Release 1) Check out a fresh copy from CVS into a temporary directory 2) Run make-release-sgi.sh - -Upload the files to the SourceForge download section. +Add a release tag on GitHub # formerly: Upload the files to the SourceForge download section. Update the web site. diff --git a/full-release.sh b/full-release.sh index e586563..c2c6468 100755 --- a/full-release.sh +++ b/full-release.sh @@ -9,7 +9,7 @@ die() { } -BASE=audiere-1.9.4 +BASE=audiere-1.10.1 START_FILES=$(pwd) diff --git a/make-release-sgi.sh b/make-release-sgi.sh index 93754af..4f980a2 100755 --- a/make-release-sgi.sh +++ b/make-release-sgi.sh @@ -5,7 +5,7 @@ die() { exit 1 } -VERSION=1.9.4 +VERSION=1.10.1 NAME=audiere-$VERSION-sgi FILE=$NAME.tar.gz diff --git a/make-release-win32.sh b/make-release-win32.sh index c1a91c9..c03f95f 100755 --- a/make-release-win32.sh +++ b/make-release-win32.sh @@ -36,7 +36,7 @@ echo echo "Build complete" echo -NAME=audiere-1.9.4-win32 +NAME=audiere-1.10.1-win32 DIST=dist scons -f vc6/dist.py prefix=$DIST/$NAME || die diff --git a/src/audiere.h b/src/audiere.h index cf7e701..a50f4d8 100644 --- a/src/audiere.h +++ b/src/audiere.h @@ -2,7 +2,7 @@ * @file * * Audiere Sound System - * Version 1.9.4 + * Version 1.10.1 * (c) 2001-2003 Chad Austin * * This API uses principles explained at diff --git a/src/audiere.rc b/src/audiere.rc index a0c9e2e..dc766e7 100755 --- a/src/audiere.rc +++ b/src/audiere.rc @@ -54,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,4,0 - PRODUCTVERSION 1,9,4,0 + FILEVERSION 1,10,1,0 + PRODUCTVERSION 1,10,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,14 +73,14 @@ BEGIN VALUE "Comments", "http://audiere.sourceforge.net/\0" VALUE "CompanyName", "http://aegisknight.org/\0" VALUE "FileDescription", "audiere\0" - VALUE "FileVersion", "1.9.4\0" + VALUE "FileVersion", "1.10.1\0" VALUE "InternalName", "audiere\0" VALUE "LegalCopyright", "Copyright © 2003\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "audiere.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "audiere\0" - VALUE "ProductVersion", "1.9.4\0" + VALUE "ProductVersion", "1.10.1\0" VALUE "SpecialBuild", "\0" END END diff --git a/src/version.cpp b/src/version.cpp index ac1a0d6..d1f1877 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -5,7 +5,7 @@ namespace audiere { ADR_EXPORT(const char*) AdrGetVersion() { - return "1.9.4"; + return "1.10.1"; } }