From 78f82cdf6165e94c3700166d4f7f3723c2a30bf6 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Sun, 8 Feb 2009 01:12:05 +0000 Subject: [PATCH 1/5] Updated fixver.sh to not update versions in files which have been removed. --- misc/fixver.sh | 69 +++----------------------------------------------- 1 file changed, 3 insertions(+), 66 deletions(-) diff --git a/misc/fixver.sh b/misc/fixver.sh index f61f3089b3..d8ae769862 100755 --- a/misc/fixver.sh +++ b/misc/fixver.sh @@ -1,8 +1,6 @@ -#! /bin/sh +#! /bin/sh -e # -# Shell script to adjust the version numbers and dates in allegro.h, -# dllver.rc, readme._tx, allegro._tx, makefile.ver, allegro5-config.in, -# allegro-config.qnx, modules.lst and allegro.spec . +# Shell script to adjust the version numbers and dates in files. # # Note: if you pass "datestamp" as the only argument, then the version # digits will remain unchanged and the comment will be set to the date. @@ -49,75 +47,14 @@ echo "Patching include/allegro5/base.h..." cp include/allegro5/base.h fixver.tmp sed -f fixver.sed fixver.tmp > include/allegro5/base.h -# Note: DMC does not support { and } in resource files so we use -# BEGIN and END instead. -echo "Patching src/win/dllver.rc..." -cat > src/win/dllver.rc << END_OF_DLLVER -// Windows resource file for the version info sheet -// generated by misc/fixver.sh - -#include - - -1 VERSIONINFO -FILEVERSION $1, $2, $3, 0 -PRODUCTVERSION $1, $2, $3, 0 -FILEOS VOS__WINDOWS32 -FILETYPE VFT_DLL -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - BEGIN - VALUE "Comments", "Please see AUTHORS for a list of contributors\000" - VALUE "CompanyName", "Allegro Developers\000\000" - VALUE "FileDescription", "Allegro\000" - VALUE "FileVersion", "$verstr\000" - VALUE "InternalName", "ALLEG$1$2\000" - VALUE "LegalCopyright", "Copyright © 1994-$year Allegro Developers\000\000" - VALUE "OriginalFilename", "ALLEG$1$2.DLL\000" - VALUE "ProductName", "Allegro\000" - VALUE "ProductVersion", "$verstr\000" - END - END - - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0809, 1252 - END -END - -END_OF_DLLVER - -# patch readme._tx +# patch the OSX package readme echo "s/\\_\/__\/ Version .*/\\_\/__\/ Version $verstr/" > fixver.sed echo "s/By Shawn Hargreaves, .*\./By Shawn Hargreaves, $datestr\./" >> fixver.sed -echo "Patching readme._tx..." -cp docs/src/readme._tx fixver.tmp -sed -f fixver.sed fixver.tmp > docs/src/readme._tx - -# patch allegro._tx -echo "s/@manh=\"version [^\"]*\"/@manh=\"version $verstr\"/" >> fixver.sed - -echo "Patching docs/src/allegro._tx..." -cp docs/src/allegro._tx fixver.tmp -sed -f fixver.sed fixver.tmp > docs/src/allegro._tx - -# patch the OSX package readme echo "Patching misc/pkgreadme._tx..." cp misc/pkgreadme._tx fixver.tmp sed -f fixver.sed fixver.tmp > misc/pkgreadme._tx -# patch makefile.ver -echo "s/LIBRARY_VERSION = .*/LIBRARY_VERSION = $1$2/" > fixver.sed -echo "s/shared_version = .*/shared_version = $1.$2.$3/" >> fixver.sed -echo "s/shared_major_minor = .*/shared_major_minor = $1.$2/" >> fixver.sed - -echo "Patching makefile.ver..." -cp makefile.ver fixver.tmp -sed -f fixver.sed fixver.tmp > makefile.ver - # patch allegro5-config.in, allegro-config.qnx echo "s/version=[0-9].*/version=$1.$2.$3/" >> fixver.sed From 7ccc000f71df2129259af2f95289d09ca50e99e8 Mon Sep 17 00:00:00 2001 From: Trent Gamblin Date: Sun, 8 Feb 2009 02:58:26 +0000 Subject: [PATCH 2/5] Fixed a bug reported in this thread: http://www.allegro.cc/forums/thread/599145 where memory bitmaps were getting an invalid pixel format if ALLEGRO_PIXEL_FORMAT_ANY was used --- src/bitmap_new.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bitmap_new.c b/src/bitmap_new.c index 4022682596..71ae876782 100644 --- a/src/bitmap_new.c +++ b/src/bitmap_new.c @@ -40,6 +40,7 @@ static ALLEGRO_BITMAP *_al_create_memory_bitmap(int w, int h) /* Pick an appropriate format if the user is vague */ switch (format) { + case ALLEGRO_PIXEL_FORMAT_ANY: case ALLEGRO_PIXEL_FORMAT_ANY_NO_ALPHA: case ALLEGRO_PIXEL_FORMAT_ANY_32_NO_ALPHA: format = ALLEGRO_PIXEL_FORMAT_XRGB_8888; From b32d10a687111cffb1c671b181936f7d1ebc1e34 Mon Sep 17 00:00:00 2001 From: Trent Gamblin Date: Sun, 8 Feb 2009 17:35:26 +0000 Subject: [PATCH 3/5] Fixed my last commit, ALLEGRO_PIXEL_FORMAT_ANY should choose an alpha format for bitmaps --- src/bitmap_new.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bitmap_new.c b/src/bitmap_new.c index 71ae876782..ccff77916e 100644 --- a/src/bitmap_new.c +++ b/src/bitmap_new.c @@ -40,11 +40,11 @@ static ALLEGRO_BITMAP *_al_create_memory_bitmap(int w, int h) /* Pick an appropriate format if the user is vague */ switch (format) { - case ALLEGRO_PIXEL_FORMAT_ANY: case ALLEGRO_PIXEL_FORMAT_ANY_NO_ALPHA: case ALLEGRO_PIXEL_FORMAT_ANY_32_NO_ALPHA: format = ALLEGRO_PIXEL_FORMAT_XRGB_8888; break; + case ALLEGRO_PIXEL_FORMAT_ANY: case ALLEGRO_PIXEL_FORMAT_ANY_WITH_ALPHA: case ALLEGRO_PIXEL_FORMAT_ANY_32_WITH_ALPHA: format = ALLEGRO_PIXEL_FORMAT_ARGB_8888; From 616558ad60b47758cd20aed73509e3d88af8613f Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Mon, 9 Feb 2009 08:22:22 +0000 Subject: [PATCH 4/5] Include pandoc generated HTML documentation in releases. Don't need Natural Docs. --- docs/CMakeLists.txt | 5 ----- misc/zipup.sh | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 0dd0bce333..82fba7816d 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -91,11 +91,6 @@ if(PANDOC) txt/changes-4.9.txt ) endif(MAKEINFO) - pandoc( - src/refman/threads.txt - html/refman/threads.html - -c pandoc.css - ) endif(PANDOC) add_custom_target(docs diff --git a/misc/zipup.sh b/misc/zipup.sh index 5964a13bfd..c214dc076b 100755 --- a/misc/zipup.sh +++ b/misc/zipup.sh @@ -182,9 +182,9 @@ then mkdir $builddir ( cd $builddir cmake .. - make docs + make docs html mv docs/txt/changes-4.9.txt ../CHANGES-4.9.txt - mv docs/html ../docs/html + mv docs/src/refman/*.{html,css} ../docs/html ) || exit 1 rm -rf $builddir else @@ -193,16 +193,16 @@ fi # generate NaturalDocs documentation -if which NaturalDocs >/dev/null -then - echo "Generating NaturalDocs..." - ( cd docs/naturaldocs - make clean - make public - ) || exit 1 -else - echo "WARNING: NaturalDocs not found, skipping step" 1>&2 -fi +# if which NaturalDocs >/dev/null +# then +# echo "Generating NaturalDocs..." +# ( cd docs/naturaldocs +# make clean +# make public +# ) || exit 1 +# else +# echo "WARNING: NaturalDocs not found, skipping step" 1>&2 +# fi # create language.dat and keyboard.dat files From 2052ed49a928a580b6fd84dd0ef7493b67cc2926 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Mon, 9 Feb 2009 09:15:59 +0000 Subject: [PATCH 5/5] Put Pandoc generated HTML documentation in docs/html/refman, making it in case it doesn't exist. --- misc/zipup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/zipup.sh b/misc/zipup.sh index c214dc076b..ad0ca02564 100755 --- a/misc/zipup.sh +++ b/misc/zipup.sh @@ -184,7 +184,8 @@ then cmake .. make docs html mv docs/txt/changes-4.9.txt ../CHANGES-4.9.txt - mv docs/src/refman/*.{html,css} ../docs/html + test -d ../docs/html/refman || mkdir -p ../docs/html/refman + mv docs/src/refman/*.{html,css} ../docs/html/refman ) || exit 1 rm -rf $builddir else