From 0f243056bbb2bb28740988399e7fd248e6447c09 Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 16 Jun 2011 20:43:55 -0300 Subject: [PATCH] Improve dist.sh file to include only "git grep -l" files in source dist. --- misc/dist.sh | 223 +++++++++------------------------------------------ 1 file changed, 36 insertions(+), 187 deletions(-) diff --git a/misc/dist.sh b/misc/dist.sh index 719a8368b..db9024c91 100644 --- a/misc/dist.sh +++ b/misc/dist.sh @@ -1,7 +1,7 @@ #! /bin/sh dir="`pwd`" -version=0.8.2-beta +version=0.9 distdir=ase-$version zip="zip -9" zip_recursive_flag="-r" @@ -11,171 +11,24 @@ if [ -f ./7za.exe ] ; then zip_recursive_flag="" fi -freetype_files="third_party/freetype/ChangeLog \ - third_party/freetype/descrip.mms \ - third_party/freetype/INSTALL \ - third_party/freetype/README \ - third_party/freetype/README.UNX \ - third_party/freetype/docs/* \ - third_party/freetype/include/*.h \ - third_party/freetype/include/freetype/*.h \ - third_party/freetype/include/freetype/cache/*.h \ - third_party/freetype/include/freetype/config/*.h \ - third_party/freetype/include/freetype/internal/*.h \ - third_party/freetype/src/autohint/*.[ch] \ - third_party/freetype/src/autohint/*.py \ - third_party/freetype/src/autohint/*.txt \ - third_party/freetype/src/base/*.[ch] \ - third_party/freetype/src/cache/*.[ch] \ - third_party/freetype/src/cff/*.[ch] \ - third_party/freetype/src/cid/*.[ch] \ - third_party/freetype/src/pcf/*.[ch] \ - third_party/freetype/src/psaux/*.[ch] \ - third_party/freetype/src/pshinter/*.[ch] \ - third_party/freetype/src/psnames/*.[ch] \ - third_party/freetype/src/raster/*.[ch] \ - third_party/freetype/src/sfnt/*.[ch] \ - third_party/freetype/src/smooth/*.[ch] \ - third_party/freetype/src/truetype/*.[ch] \ - third_party/freetype/src/type1/*.[ch] \ - third_party/freetype/src/winfonts/*.[ch]" - -jpeg_files="third_party/jpeg/*.[ch] \ - third_party/jpeg/*.log \ - third_party/jpeg/*.doc \ - third_party/jpeg/*.asm \ - third_party/jpeg/*.txt" - -libart_files="third_party/libart_lgpl/AUTHORS \ - third_party/libart_lgpl/ChangeLog \ - third_party/libart_lgpl/COPYING \ - third_party/libart_lgpl/INSTALL \ - third_party/libart_lgpl/NEWS \ - third_party/libart_lgpl/README \ - third_party/libart_lgpl/*.[ch]" - -libpng_files="third_party/libpng/*.[ch] \ - third_party/libpng/*.txt \ - third_party/libpng/LICENSE \ - third_party/libpng/README \ - third_party/libpng/TODO \ - third_party/libpng/Y2KINFO" - -loadpng_files="third_party/loadpng/*.[ch] \ - third_party/loadpng/*.txt" - -tinyxml_files="third_party/tinyxml/*.txt \ - third_party/tinyxml/*.cpp \ - third_party/tinyxml/*.h" - -zlib_files="third_party/zlib/*.[ch] \ - third_party/zlib/*.txt \ - third_party/zlib/README" - -ase_files="config.h \ - COPYING \ - NEWS.txt \ - README.html \ - TODO.txt \ - data/convmatr.def \ - data/*.xml \ - data/fonts/*.pcx \ - data/icons/ase*.ico \ - data/icons/ase*.png \ - data/palettes/*.col \ - data/skins/*/*.pcx \ - data/skins/*/*.png \ - data/skins/*/*.xml \ - data/widgets/*.xml \ - docs/*.pdf \ - docs/files/*.txt \ - docs/licenses/*.txt \ - misc/deps.sh \ - misc/dist.sh \ - misc/etags.sh \ - obj/*.txt \ - obj/mingw32/*.txt \ - obj/msvc/*.txt \ - obj/unix/*.txt \ - src/*.cpp \ - src/*.h \ - src/*.rc \ - src/commands/*.cpp \ - src/commands/*.h \ - src/commands/fx/*.cpp \ - src/commands/fx/*.h \ - src/core/*.cpp \ - src/core/*.h \ - src/dialogs/*.cpp \ - src/dialogs/*.h \ - src/effect/*.cpp \ - src/effect/*.h \ - src/file/*.cpp \ - src/file/*.h \ - src/file/fli/*.cpp \ - src/file/fli/*.h \ - src/file/fli/README \ - src/file/gif/*.cpp \ - src/file/gif/*.h \ - src/intl/*.cpp \ - src/intl/*.h \ - src/jinete/*.cpp \ - src/jinete/*.h \ - src/jinete/themes/*.cpp \ - src/jinete/themes/*.h \ - src/jinete/themes/Makefile.icons \ - src/jinete/themes/stand/*.pcx \ - src/modules/*.cpp \ - src/modules/*.h \ - src/raster/*.cpp \ - src/raster/*.h \ - src/settings/*.cpp \ - src/settings/*.h \ - src/tests/*.cpp \ - src/tests/*.h \ - src/tests/jinete/*.cpp \ - src/tests/jinete/*.jid \ - src/tests/jinete/*.pcx \ - src/tests/jinete/*.ttf \ - src/tests/jinete/*.txt \ - src/tests/raster/*.cpp \ - src/tools/*.cpp \ - src/tools/*.h \ - src/util/*.cpp \ - src/util/*.h \ - src/widgets/*.cpp \ - src/widgets/*.h \ - src/widgets/editor/*.cpp \ - src/widgets/editor/*.h \ - src/widgets/editor/*.txt \ - third_party/*.txt" +if [ ! -f dist.sh ]; then + echo You must run dist.sh from misc/ directory + exit 1 +fi ###################################################################### -# Source Distribution +# Source Distribution (copy all files in the git repository) if [ ! -f $distdir.zip ] ; then + cd "$dir/.." + mkdir "$dir/$distdir" + cp --parents $(git grep -l .) "$dir/$distdir" + cd "$dir" -cd "$dir/.." -mkdir "$dir/$distdir" - -cp --parents \ - $freetype_files \ - $jpeg_files \ - $libart_files \ - $libpng_files \ - $loadpng_files \ - $tinyxml_files \ - $zlib_files \ - $ase_files \ - "$dir/$distdir" - -cd "$dir" - -# tar vczf $distdir.tar.gz $distdir -# tar vcjf $distdir.tar.bz2 $distdir -$zip $zip_recursive_flag $distdir.zip $distdir -rm -fr $distdir - + #tar vczf $distdir.tar.gz $distdir + #tar vcjf $distdir.tar.bz2 $distdir + $zip $zip_recursive_flag $distdir.zip $distdir + rm -fr $distdir fi ###################################################################### @@ -184,9 +37,8 @@ fi function def_common_files() { txt_files=" \ -$1/NEWS.txt \ $1/README.html \ -$1/COPYING \ +$1/LICENSE.txt \ $1/data/convmatr.def \ $1/data/*.xml \ $1/docs/files/*.txt \ @@ -194,11 +46,9 @@ $1/docs/licenses/*.txt \ $1/data/widgets/*.xml" bin_files=" \ -$1/data/aseicon.* \ $1/data/palettes/*.col \ $1/data/icons/ase*.ico \ $1/data/icons/ase*.png \ -$1/data/skins/*/*.pcx \ $1/data/skins/*/*.png \ $1/data/skins/*/*.xml \ $1/docs/*.pdf" @@ -209,32 +59,31 @@ $1/docs/*.pdf" if [ ! -f $distdir-win32.zip ] ; then -cd "$dir/.." -#make -f makefile.vc CONFIGURED=1 RELEASE=1 STATIC_ALLEG_LINK=1 clean -#make -f makefile.vc CONFIGURED=1 RELEASE=1 STATIC_ALLEG_LINK=1 -def_common_files . -mkdir "$dir/$distdir-win32" + cd "$dir/.." + #make -f makefile.vc CONFIGURED=1 RELEASE=1 STATIC_ALLEG_LINK=1 clean + #make -f makefile.vc CONFIGURED=1 RELEASE=1 STATIC_ALLEG_LINK=1 + def_common_files . + mkdir "$dir/$distdir-win32" -# For Allegro dll / C Runtime dll -#cp -r --parents $txt_files $bin_files aseprite.exe alleg44.dll msvcr90.dll "$dir/$distdir-win32" + # For Allegro dll / C Runtime dll + #cp -r --parents $txt_files $bin_files aseprite.exe alleg44.dll msvcr90.dll "$dir/$distdir-win32" -# For Allegro static / static C runtime dll (use /MT to compile Allegro) -cp -r --parents $txt_files $bin_files aseprite.exe "$dir/$distdir-win32" + # For Allegro static / static C runtime dll (use /MT to compile Allegro) + cp -r --parents $txt_files $bin_files aseprite.exe "$dir/$distdir-win32" -cd "$dir" -def_common_files $distdir-win32 -$zip $distdir-win32.zip $txt_files + cd "$dir" + def_common_files $distdir-win32 + $zip $distdir-win32.zip $txt_files -# Dynamic version of DLLs -#$zip $distdir-win32.zip $bin_files \ -# $distdir-win32/aseprite.exe \ -# $distdir-win32/alleg44.dll \ -# $distdir-win32/msvcr90.dll + # Dynamic version of DLLs + #$zip $distdir-win32.zip $bin_files \ + # $distdir-win32/aseprite.exe \ + # $distdir-win32/alleg44.dll \ + # $distdir-win32/msvcr90.dll -# Static version -$zip $distdir-win32.zip $bin_files \ - $distdir-win32/aseprite.exe - -rm -fr $distdir-win32 + # Static version + $zip $distdir-win32.zip $bin_files \ + $distdir-win32/aseprite.exe + rm -fr $distdir-win32 fi