Skip to content

Commit

Permalink
bumped version
Browse files Browse the repository at this point in the history
  • Loading branch information
Poikilos committed Dec 5, 2017
1 parent 20f9a27 commit 1c3c102
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 23 deletions.
2 changes: 1 addition & 1 deletion HowTo-expertmm.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ and <https://github.com/expertmm/Audiere/blob/master/doc/overview.txt>
and <https://github.com/expertmm/Audiere/blob/master/doc/tutorial.txt>

## 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
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ])
12 changes: 11 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions doc/changelog.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/audiere-devel.doxy
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/audiere-users.doxy
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/doxygen-dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ die() {
}

archive() {
VERSION=1.9.4
VERSION=1.10.1
AUDIENCE=$1
BASE=audiere-$VERSION-$AUDIENCE-doxygen

Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/mainpage.doxy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** @mainpage Audiere 1.9.4
/** @mainpage Audiere 1.10.1

Audiere is a high-level, straightforward, and portable audio API.

Expand Down
12 changes: 6 additions & 6 deletions doc/release-howto.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bump the Version Number
Bump the Version Number (using Semantic Versioning)

The following files contain version information:
configure.in
Expand All @@ -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

Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion full-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ die() {
}


BASE=audiere-1.9.4
BASE=audiere-1.10.1

START_FILES=$(pwd)

Expand Down
2 changes: 1 addition & 1 deletion make-release-sgi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ die() {
exit 1
}

VERSION=1.9.4
VERSION=1.10.1
NAME=audiere-$VERSION-sgi
FILE=$NAME.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion make-release-win32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/audiere.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/audiere.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace audiere {

ADR_EXPORT(const char*) AdrGetVersion() {
return "1.9.4";
return "1.10.1";
}

}

0 comments on commit 1c3c102

Please sign in to comment.