From 53496dda1c820359892f7121dfccbce2b480d08a Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Sat, 25 Jan 2003 06:04:55 +0000 Subject: [PATCH] bump version number to 1.1.0 --- README | 6 +----- build/config.mk | 2 +- configure.in | 2 +- doc/Doxyfile | 2 +- flac.pbproj/project.pbxproj | 4 ++-- src/libFLAC/Makefile.vc | 4 ++-- src/libFLAC/format.c | 4 ++-- src/libFLAC/libFLAC_dynamic.dsp | 4 ++-- src/libFLAC/libFLAC_static.dsp | 4 ++-- src/plugin_winamp2/in_flac.dsp | 4 ++-- src/test_libFLAC++/Makefile.vc | 4 ++-- src/test_libFLAC/Makefile.vc | 4 ++-- src/test_libOggFLAC++/Makefile.vc | 4 ++-- src/test_libOggFLAC/Makefile.vc | 4 ++-- src/test_streams/Makefile.vc | 4 ++-- 15 files changed, 26 insertions(+), 30 deletions(-) diff --git a/README b/README index bdc7a282..4af5f79b 100644 --- a/README +++ b/README @@ -39,7 +39,7 @@ License (GFDL). =============================================================================== -FLAC - 1.0.5_beta2 - Contents +FLAC - 1.1.0 - Contents =============================================================================== - Introduction @@ -54,10 +54,6 @@ FLAC - 1.0.5_beta2 - Contents Introduction =============================================================================== -@@@@ NOTE @@@@ -This is a beta release. The CUESHEET metadata block specification has not -been finalized. - This is the source release for the FLAC project. See doc/index.html diff --git a/build/config.mk b/build/config.mk index a0b8b4b8..30ba5884 100644 --- a/build/config.mk +++ b/build/config.mk @@ -35,7 +35,7 @@ all default: $(DEFAULT_BUILD) # GNU makefile fragment for emulating stuff normally done by configure # -VERSION=\"1.0.5_beta2\" +VERSION=\"1.1.0\" ORDINALS_H = $(topdir)/include/FLAC/ordinals.h diff --git a/configure.in b/configure.in index 42e8c03d..fff6acb7 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ # instead of FLAC__ since autoconf triggers off 'AC_' in strings AC_INIT(src/flac/main.c) -AM_INIT_AUTOMAKE(flac, 1.0.5_beta2) +AM_INIT_AUTOMAKE(flac, 1.1.0) # Don't automagically regenerate autoconf/automake generated files unless # explicitly requested. Eases autobuilding -mdz diff --git a/doc/Doxyfile b/doc/Doxyfile index f40a4a2a..e197df16 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -23,7 +23,7 @@ PROJECT_NAME = FLAC # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.0.5_beta2 +PROJECT_NUMBER = 1.1.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/flac.pbproj/project.pbxproj b/flac.pbproj/project.pbxproj index 67f18e8f..0d768799 100644 --- a/flac.pbproj/project.pbxproj +++ b/flac.pbproj/project.pbxproj @@ -844,7 +844,7 @@ buildSettings = { HEADER_SEARCH_PATHS = include; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.0.5_beta2\\\\\\\""; + OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.0\\\\\\\""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = flac; @@ -1721,7 +1721,7 @@ buildSettings = { HEADER_SEARCH_PATHS = include; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.0.5_beta2\\\\\\\""; + OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.0\\\\\\\""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = metaflac; diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc index e49b3708..79ad29b6 100644 --- a/src/libFLAC/Makefile.vc +++ b/src/libFLAC/Makefile.vc @@ -22,10 +22,10 @@ NASM=nasmw !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" -DVERSION=\"1.0.5_beta2\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" -DVERSION=\"1.1.0\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" -DVERSION=\"1.0.5_beta2\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" -DVERSION=\"1.1.0\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c index 15c8afff..6c01f6d9 100644 --- a/src/libFLAC/format.c +++ b/src/libFLAC/format.c @@ -37,9 +37,9 @@ FLAC_API const char *FLAC__VERSION_STRING = VERSION; #if defined _MSC_VER || defined __MINW32__ /* yet one more hack because of MSVC6: */ -FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.0.5_beta2 20030114"; +FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.1.0 20030126"; #else -FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20030114"; +FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20030126"; #endif FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' }; diff --git a/src/libFLAC/libFLAC_dynamic.dsp b/src/libFLAC/libFLAC_dynamic.dsp index c0357edc..f6b674b6 100644 --- a/src/libFLAC/libFLAC_dynamic.dsp +++ b/src/libFLAC/libFLAC_dynamic.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.5_beta2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.0\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.5_beta2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.0\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/src/libFLAC/libFLAC_static.dsp b/src/libFLAC/libFLAC_static.dsp index c0536b6a..02d761f4 100644 --- a/src/libFLAC/libFLAC_static.dsp +++ b/src/libFLAC/libFLAC_static.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.0.5_beta2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.1.0\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.0.5_beta2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.1.0\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/src/plugin_winamp2/in_flac.dsp b/src/plugin_winamp2/in_flac.dsp index 2c792e38..b7d95256 100644 --- a/src/plugin_winamp2/in_flac.dsp +++ b/src/plugin_winamp2/in_flac.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.0.5_beta2\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.1.0\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.0.5_beta2\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.1.0\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc index 9b097ba6..252081c0 100644 --- a/src/test_libFLAC++/Makefile.vc +++ b/src/test_libFLAC++/Makefile.vc @@ -21,10 +21,10 @@ SUFFIXES = .cpp !IFDEF DEBUG .c.obj: - $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX /Od /D "_DEBUG" $< + $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX -DNODEBUG $< + $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX -DNODEBUG $< !endif !IFDEF DEBUG diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc index c2a3250d..a8008562 100644 --- a/src/test_libFLAC/Makefile.vc +++ b/src/test_libFLAC/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX /Od /D "_DEBUG" $< + $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX -DNODEBUG $< + $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc index c162dbb6..9f218276 100644 --- a/src/test_libOggFLAC++/Makefile.vc +++ b/src/test_libOggFLAC++/Makefile.vc @@ -21,10 +21,10 @@ SUFFIXES = .cpp !IFDEF DEBUG .c.obj: - $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX /Od /D "_DEBUG" $< + $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX -DNODEBUG $< + $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX -DNODEBUG $< !endif !IFDEF DEBUG diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc index d382b136..33293af8 100644 --- a/src/test_libOggFLAC/Makefile.vc +++ b/src/test_libOggFLAC/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX /Od /D "_DEBUG" $< + $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX -DNODEBUG $< + $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/test_streams/Makefile.vc b/src/test_streams/Makefile.vc index 1311a793..c748193c 100644 --- a/src/test_streams/Makefile.vc +++ b/src/test_streams/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX /Od /D "_DEBUG" $< + $(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.5_beta2\" -YX -DNODEBUG $< + $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.1.0\" -YX -DNODEBUG $< !endif C_FILES= \