diff --git a/File_id.diz b/File_id.diz index 4927e6a..0f75300 100644 --- a/File_id.diz +++ b/File_id.diz @@ -4,7 +4,4 @@ This is unstable release and it should be used for testing purposes.Use it at your risk! ----------------------------- -GoldED+ is a successor of the -wellknown GoldED mail editor. ------------------------------ *golded-plus.sourceforge.net* diff --git a/dist-gpc.sh b/dist-gpc.sh index 4b88523..a843cef 100755 --- a/dist-gpc.sh +++ b/dist-gpc.sh @@ -1,9 +1,12 @@ -#!/bin/sh - +#!/bin/bash +# $Id$ # Create a archive 'gpc*.zip' with configuration files examples. -date=`date +%Y%m%d` -shortdate=`echo ${date} | sed s/^...//` +srcdatefile=srcdate.h +build=`sed -n 's/.*"\([[:digit:]]\{8\}\)".*/\1/p' $srcdatefile` +date="$build" +shortdate=${date/???/} + shortname=../gpc${shortdate}.zip name=../gpc115-${date}.zip diff --git a/dist-gpd.sh b/dist-gpd.sh index a544f83..f7afbfb 100755 --- a/dist-gpd.sh +++ b/dist-gpd.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # $Id$ # Create a archive 'gpd*.zip' (gpdYMMDD.zip) with DOS/DPMI (DJGPP) build # of the Golded+. @@ -35,11 +35,17 @@ then exit fi -date=`date +%Y%m%d` -shortdate=`echo ${date} | sed s/^...//` +srcdatefile=srcdate.h +build=`sed -n 's/.*"\([[:digit:]]\{8\}\)".*/\1/p' $srcdatefile` +date="$build" +#shortdate=`echo ${date} | sed s/^...//` +shortdate=${date/???/} +platform="djg" +binsuffix="${platform}.exe" +binesdir="bin" +dizfile="$binesdir/file_id.diz" name=../gpd${shortdate}.zip dosname=..\\gpd${shortdate}.zip -file_id=bin/File_ID.Diz echo Build a Golded+/DPMI binary package: ${name} and ${shortname} @@ -48,40 +54,37 @@ if [ ! -f golded3/mygolded.h ]; then echo "golded3/mygolded.h is created now. Please edit this file" exit 1 fi -#sed -i.orig -e "s/\#define __GVER_POSTVERSION__ .*/\#define __GVER_POSTVERSION__ \"-b${date}\"/" golded3/mygolded.h -bines="bin/geddjg.exe bin/gndjg.exe bin/rddtdjg.exe" +bines="${binesdir}/ged${binsuffix} ${binesdir}/gn${binsuffix} ${binesdir}/rddt${binsuffix}" files="${bines} docs/copying docs/copying.lib golded.bat" files="${files} docs/golded.html docs/golded.txt docs/goldnode.html" files="${files} docs/goldnode.txt docs/license.txt docs/notework.txt" files="${files} docs/rddt.html docs/rddt.txt docs/readme.txt docs/notework.rus" files="${files} docs/rusfaq.txt docs/tips.txt docs/todowork.txt" -files="${files} docs/tokencfg.txt docs/tokentpl.txt ${file_id}" +files="${files} docs/tokencfg.txt docs/tokentpl.txt ${dizfile}" -echo 'GoldED+1.1.5 [DOS-DPMI binaries]' >${file_id} -echo '[Compiled using DJGPP GNU C/C++]' >>${file_id} -echo "Snapshot at ${date} (devel.ver.)" >>${file_id} -echo 'This is unstable release and it' >>${file_id} -echo 'should be used for testing purpose' >>${file_id} -echo '----------------------------------' >>${file_id} -echo 'GoldED+ is a successor of the' >>${file_id} -echo 'wellknown GoldED mail editor.' >>${file_id} -echo '----------------------------------' >>${file_id} -echo 'http://golded-plus.sourceforge.net' >>${file_id} +compilerver=`gcc -v 2>&1 | sed -n -e '/^gcc version/{s/gcc version \([[:digit:].]\{2,\}\)\s\((\([[:alnum:]]\{2,\}\)\sspecial\).*/\1 \3/p;q}'` +printf 'GoldED+1.1.5 beta at %8.8s\r\n' $build >${dizfile} +printf 'DOS32-DPMI binaries compiled\r\n' >>${dizfile} +printf 'using DJGPP GNU C/C++ %-7.7s\r\n' "$compilerver" >>${dizfile} +printf 'This is unstable release and\r\n' >>${dizfile} +printf 'it should be used for testing\r\n' >>${dizfile} +printf -- '-----------------------------\r\n' >>${dizfile} +printf ' *http://golded-plus.sf.net* \r\n' >>${dizfile} -rm ${bines} +for f in ${bines}; do rm $f; done -make PLATFORM=djg clean -make PLATFORM=djg -make PLATFORM=djg strip +make PLATFORM=${platform} clean +make PLATFORM=${platform} +make PLATFORM=${platform} strip make docs for i in ${bines} ; do if [ ! -f ${i} ] ; then echo "File ${i} not exists, stop!"; exit 1 ; fi done -#zip -9DXj ${name} ${file_id} $files -#7za a -tzip ${name} ${file_id} $files +#zip -9DXj ${name} $files +#7za a -tzip ${name} $files echo ${files} | sed "s/ /\n/g" >files.lst pkzip ${dosname} @files.lst diff --git a/dist-gpl.sh b/dist-gpl.sh index acce890..87709ea 100755 --- a/dist-gpl.sh +++ b/dist-gpl.sh @@ -1,12 +1,20 @@ -#!/bin/sh - +#!/bin/bash +# $Id$ # Create a archive 'gpl-*.zip' (gplYMMDD.zip) with binary linux build # of the Golded+. -date=`date +%Y%m%d` -shortdate=`echo ${date} | sed s/^...//` +srcdatefile=srcdate.h +build=`sed -n 's/.*"\([[:digit:]]\{8\}\)".*/\1/p' $srcdatefile` +date="$build" +shortdate=${date/???/} + +platform="lnx" +binsuffix="lnx" +binesdir="bin" +dizfile="$binesdir/File_ID.Diz" shortname=../gpl${shortdate}.zip name=../gpl115-${date}.zip +requirements_file="${binesdir}/requirements.txt" echo Build a Golded+/lnx binary package: ${name} and ${shortname} @@ -15,31 +23,30 @@ if [ ! -f golded3/mygolded.h ]; then echo "golded3/mygolded.h is created now. Please edit this file" exit 1 fi -#sed -i.orig -e "s/\#define __GVER_POSTVERSION__ .*/\#define __GVER_POSTVERSION__ \"-b${date}\"/" golded3/mygolded.h -bines="bin/gedlnx bin/gnlnx bin/rddtlnx" -files="${bines} docs/copying docs/copying.lib bin/requirements.txt" -files="${files} bin/golded bin/openbsd-vt220.sh" +bines="${binesdir}/ged${binsuffix} ${binesdir}/gn${binsuffix} ${binesdir}/rddt${binsuffix}" +files="${bines} docs/copying docs/copying.lib ${requirements_file}" +files="${files} bin/golded bin/openbsd-vt220.sh ${dizfile}" files="${files} docs/golded.html docs/golded.txt docs/goldnode.html" files="${files} docs/goldnode.txt docs/license.txt docs/notework.txt" files="${files} docs/rddt.html docs/rddt.txt docs/readme.txt docs/notework.rus" files="${files} docs/rusfaq.txt docs/rusfaq.koi8r docs/rusfaq.utf8 docs/tips.txt docs/todowork.txt" -files="${files} docs/tokencfg.txt docs/tokentpl.txt bin/requirements.txt" +files="${files} docs/tokencfg.txt docs/tokentpl.txt" files="${files} docs/notework.rus docs/notework.koi8r docs/notework.utf8" -printf "GoldED+1.1.5 [`uname` binaries]\r\n" >bin/File_ID.Diz -printf 'Snapshot (development version)\r\n' >>bin/File_ID.Diz -printf 'This is unstable release and\r\n' >>bin/File_ID.Diz -printf 'it should be used for testing.\r\n' >>bin/File_ID.Diz -printf -- '------------------------------\r\n' >>bin/File_ID.Diz -printf 'GoldED+ is a successor of the\r\n' >>bin/File_ID.Diz -printf 'wellknown GoldED mail editor.\r\n' >>bin/File_ID.Diz -printf -- '------------------------------\r\n' >>bin/File_ID.Diz -printf '*golded-plus.sourceforge.net* \r\n' >>bin/File_ID.Diz +compilerver=`gcc -v 2>&1 | sed -n -e '/^gcc version/{s/gcc version \([[:digit:].]\{2,\}\)\s\((\([[:alnum:]]\{2,\}\)\sspecial\).*/\1 \3/p;q}'` +printf 'GoldED+1.1.5 beta at %8.8s\r\n' $build >${dizfile} +printf '%-5s binaries compiled using\r\n' "`uname`" >>${dizfile} +printf 'GNU C/C++ %13.13s\r\n' "$compilerver" >>${dizfile} +printf 'This is unstable release and\r\n' >>${dizfile} +printf 'it should be used for testing\r\n' >>${dizfile} +printf -- '-----------------------------\r\n' >>${dizfile} +printf ' *http://golded-plus.sf.net* \r\n' >>${dizfile} -make PLATFORM=lnx clean -make PLATFORM=lnx -make PLATFORM=lnx strip +for f in ${bines}; do rm $f; done +make PLATFORM=${platform} clean +make PLATFORM=${platform} +make PLATFORM=${platform} strip make docs for i in ${bines} ; do @@ -53,7 +60,7 @@ iconv -c -f cp866 -t koi8-r docs/notework.rus | sed 2s/cp866/koi8-r/ >docs/notew iconv -c -f cp866 -t utf8 docs/notework.rus | sed 2s/cp866/utf-8/ >docs/notework.utf8 echo Required libraries: >bin/requirements.txt -ldd bin/gedlnx | sed -e "s/ =.*//" -e /\\/lib\\//d -e "s/\\.so\\./ /" >>bin/requirements.txt +ldd ${binesdir}/ged${binsuffix} | sed -e "s/ =.*//" -e /\\/lib\\//d -e "s/\\.so\\./ /" >>${requirements_file} -zip -9DXj ${name} bin/File_ID.Diz $files +zip -9DXj ${name} $files ln ${name} ${shortname} || cp ${name} ${shortname} diff --git a/dist-gps.sh b/dist-gps.sh index 7bd9030..6493588 100755 --- a/dist-gps.sh +++ b/dist-gps.sh @@ -1,9 +1,12 @@ -#!/bin/sh - +#!/bin/bash +# $Id$ # Create a archives 'gps*.tar.bz2' and 'gps*.tb2' with all source tree -date=`date +%Y%m%d` -shortdate=`echo ${date} | sed s/^...//` +srcdatefile=srcdate.h +build=`sed -n 's/.*"\([[:digit:]]\{8\}\)".*/\1/p' $srcdatefile` +date="$build" +shortdate=${date/???/} + shortname=gps${shortdate}.tb2 name=gps115-${date}.tar.bz2 diff --git a/dist-gpv.sh b/dist-gpv.sh index 9d013f3..21dc441 100755 --- a/dist-gpv.sh +++ b/dist-gpv.sh @@ -1,13 +1,17 @@ -#!/bin/sh - +#!/bin/bash +# $Id$ # Create a archive 'gpwin-*.zip' (gpvYMMDD.zip) with Win32 (MS Visual C) -# builg of the Golded+. +# build of the Golded+. -date=`date +%Y%m%d` +srcdatefile=srcdate.h +build=`sed -n 's/.*"\([[:digit:]]\{8\}\)".*/\1/p' $srcdatefile` +date="$build" name=../gpwin-115-${date}.zip -shortdate=`echo ${date} | sed s/^...//` +shortdate=${date/???/} shortname=../gpv${shortdate}.zip -dizfile=Release/bin/file_id.diz +binesdir="windows/bin/release/win32" +binsuffix="win.exe" +dizfile="$binesdir/file_id.diz" echo Build a Golded+/w32mvc binary package: ${name} and ${shortname} @@ -16,9 +20,8 @@ if [ ! -f golded3/mygolded.h ]; then echo "golded3/mygolded.h is created now. Please edit this file" exit 1 fi -#sed -i.orig -e "s/\#define __GVER_POSTVERSION__ .*/\#define __GVER_POSTVERSION__ \"-b${date}\"/" golded3/mygolded.h -bines="Release/bin/gedwin.exe Release/bin/gnwin.exe Release/bin/rddtwin.exe" +bines="${binesdir}/ged${binsuffix} ${binesdir}/gn${binsuffix} ${binesdir}/rddt${binsuffix}" files="${bines} docs/copying docs/copying.lib golded.bat" files="${files} docs/golded.html docs/golded.txt docs/goldnode.html" files="${files} docs/goldnode.txt docs/license.txt docs/notework.txt" @@ -26,21 +29,19 @@ files="${files} docs/rddt.html docs/rddt.txt docs/readme.txt docs/notework.rus" files="${files} docs/rusfaq.txt docs/tips.txt docs/todowork.txt" files="${files} docs/tokencfg.txt docs/tokentpl.txt" -rm ${bines} -nmake /f gedwin.mak CFG="Release" clean -nmake /f gedwin.mak CFG="Release" - -printf 'GoldED+1.1.5 [Win32 binaries]\r\n' >${dizfile} -printf '[Compiled using MS Visual C++]\r\n' >>${dizfile} -printf 'Snapshot (development version)\r\n' >>${dizfile} -printf 'This is unstable release and\r\n' >>${dizfile} -printf 'it should be used for testing\r\n' >>${dizfile} -printf -- '------------------------------\r\n' >>${dizfile} -printf 'GoldED+ is a successor of the\r\n' >>${dizfile} -printf 'wellknown GoldED mail editor.\r\n' >>${dizfile} +VSver=`nmake /v 2>&1 | sed -ne 's/.*Version \([0-9]\{1,\}\.[0-9]\{1,\}\).*/\1/p'` +printf 'GoldED+1.1.5 beta at %8.8s\r\n' $build >${dizfile} +printf 'Win32 binaries compiled using\r\n' >>${dizfile} +printf 'Microsoft Visual Studio %5.5s\r\n' $VSver >>${dizfile} +printf 'This is unstable release and\r\n' >>${dizfile} +printf 'it should be used for testing\r\n' >>${dizfile} printf -- '------------------------------\r\n' >>${dizfile} printf ' *http://golded-plus.sf.net* \r\n' >>${dizfile} +#for f in ${bines}; do rm $f; done +#nmake /f gedwin.mak CFG="Release" clean +#nmake /f gedwin.mak CFG="Release" + make docs for i in ${bines} ; do diff --git a/dist-gpw.sh b/dist-gpw.sh index 7bff0f9..204828a 100755 --- a/dist-gpw.sh +++ b/dist-gpw.sh @@ -1,5 +1,5 @@ -#!/bin/sh - +#!/bin/bash +# $Id$ # Create a archive 'gpw32-*.zip' (gpwYMMDD.zip) with Win32 (MinGW) build # of the Golded+. @@ -9,11 +9,15 @@ then exit fi -date=`date +%Y%m%d` -shortdate=`echo ${date} | sed s/^...//` +srcdatefile=srcdate.h +build=`sed -n 's/.*"\([[:digit:]]\{8\}\)".*/\1/p' $srcdatefile` +date="$build" +shortdate=${date/???/} name=../gpw32-115-${date}.zip shortname=../gpw${shortdate}.zip -dizfile=bin/file_id.diz +binsuffix="cyg.exe" +binesdir="bin" +dizfile="$binesdir/file_id.diz" echo Build a Golded+/w32mingw binary package: ${name} and ${shortname} @@ -22,9 +26,8 @@ if [ ! -f golded3/mygolded.h ]; then echo "golded3/mygolded.h is created now. Please edit this file" exit 1 fi -#sed -i.orig -e "s/\#define __GVER_POSTVERSION__ .*/\#define __GVER_POSTVERSION__ \"-b${date}\"/" golded3/mygolded.h -bines="bin/gedcyg.exe bin/gncyg.exe bin/rddtcyg.exe" +bines="${binesdir}/ged${binsuffix} ${binesdir}/gn${binsuffix} ${binesdir}/rddt${binsuffix}" files="${bines} docs/copying docs/copying.lib golded.bat" files="${files} docs/golded.html docs/golded.txt docs/goldnode.html" files="${files} docs/goldnode.txt docs/license.txt docs/notework.txt" @@ -32,18 +35,16 @@ files="${files} docs/rddt.html docs/rddt.txt docs/readme.txt docs/notework.rus" files="${files} docs/rusfaq.txt docs/tips.txt docs/todowork.txt" files="${files} docs/tokencfg.txt docs/tokentpl.txt" -printf 'GoldED+1.1.5 [Win32 binaries]\r\n' >${dizfile} -printf '[Compiled using MinGW/Cygwin]\r\n' >>${dizfile} -printf 'Snapshot (development version)\r\n' >>${dizfile} -printf 'This is unstable release and\r\n' >>${dizfile} -printf 'it should be used for testing.\r\n' >>${dizfile} -printf -- '------------------------------\r\n' >>${dizfile} -printf 'GoldED+ is a successor of the\r\n' >>${dizfile} -printf 'wellknown GoldED mail editor.\r\n' >>${dizfile} -printf -- '------------------------------\r\n' >>${dizfile} -printf '*golded-plus.sourceforge.net* \r\n' >>${dizfile} +compilerver=`gcc -v 2>&1 | sed -n -e '/^gcc version/{s/gcc version \([[:digit:].]\{2,\}\)\s\((\([[:alnum:]]\{2,\}\)\sspecial\).*/\1 \3/p;q}'` +printf 'GoldED+1.1.5 beta at %8.8s\r\n' $build >${dizfile} +printf 'Win32 binaries compiled using\r\n' >>${dizfile} +printf 'MinGW GNU C/C++ %13.13s\r\n' "$compilerver" >>${dizfile} +printf 'This is unstable release and\r\n' >>${dizfile} +printf 'it should be used for testing\r\n' >>${dizfile} +printf -- '-----------------------------\r\n' >>${dizfile} +printf ' *http://golded-plus.sf.net* \r\n' >>${dizfile} -rm bin/*cyg.exe +for f in ${bines}; do rm $f; done make clean make make strip diff --git a/dist-sx86.sh b/dist-sx86.sh index e313bd3..262ba56 100755 --- a/dist-sx86.sh +++ b/dist-sx86.sh @@ -1,15 +1,23 @@ -#!/bin/sh - +#!/bin/bash +# $Id$ # Create an archive 'gpsunx86-115-*.zip' (gpsunx86-115-YMMDD.zip) # with binary SunOS x86 build installable package -pkgdir=bin/pkg +srcdatefile=srcdate.h +build=`sed -n 's/.*"\([[:digit:]]\{8\}\)".*/\1/p' $srcdatefile` +date="$build" +#shortdate=`echo ${date} | sed s/^...//` +shortdate=${date/???/} +binsuffix="sun" +platform="sun" +binesdir="bin" +dizfile="${binesdir}/file_id.diz" +pkgdir=${binesdir}/pkg vendor=`sed -n -e "/^#define __GVER_VENDOR_NAME__/s/#define __GVER_VENDOR_NAME__ \"\(.*\)\"/\1/p" golded3/mygolded.h` email=`sed -n -e "/^#define __GVER_VENDOR_EMAIL__/s/#define __GVER_VENDOR_EMAIL__ \"\(.*\)\"/\1/p" golded3/mygolded.h` -date=`date +%Y%m%d` -name=bin/gpsunx86-115-${date}.zip +name=${binesdir}/gpsunx86-115-${date}.zip pkgname=golded-plus-x86-115-${date}.pkg -dizfile=bin/file_id.diz +bines="${binesdir}/ged${binsuffix} ${binesdir}/gn${binsuffix} ${binesdir}/rddt${binsuffix}" echo Build a Golded+/sunX86 binary package: ${name} \(${pkgname}\) @@ -18,30 +26,29 @@ if [ ! -f golded3/mygolded.h ]; then echo "golded3/mygolded.h is created now. Please edit this file" exit 1 fi -#gsed -i.orig -e "s/\#define __GVER_POSTVERSION__ .*/\#define __GVER_POSTVERSION__ \"-b${date}\"/" golded3/mygolded.h -if [ ! -d "bin" ] ; then mkdir bin; fi +if [ ! -d "${binesdir}" ] ; then mkdir ${binesdir}; fi -printf "GoldED+1.1.5 [`uname` `uname -i` pkg]\r\n" >${dizfile} -printf 'Snapshot (development version)\r\n' >>${dizfile} -printf 'This is unstable release and\r\n' >>${dizfile} -printf 'it should be used for testing.\r\n' >>${dizfile} -printf -- '------------------------------\r\n' >>${dizfile} -printf 'GoldED+ is a successor of the\r\n' >>${dizfile} -printf 'wellknown GoldED mail editor.\r\n' >>${dizfile} -printf -- '------------------------------\r\n' >>${dizfile} -printf '*golded-plus.sourceforge.net* \r\n' >>${dizfile} +compilerver=`gcc -v 2>&1 | sed -n -e '/^gcc version/{s/gcc version \([[:digit:].]\{2,\}\)\s\((\([[:alnum:]]\{2,\}\)\sspecial\).*/\1 \3/p;q}'` +printf 'GoldED+1.1.5 beta at %8.8s\r\n' $build >${dizfile} + +printf "`uname` `uname -i` pkg compiled\r\n" >${dizfile} +printf 'using GNU C/C++ %13.13s\r\n' "$compilerver" >>${dizfile} +printf 'This is unstable release and\r\n' >>${dizfile} +printf 'it should be used for testing\r\n' >>${dizfile} +printf -- '-----------------------------\r\n' >>${dizfile} +printf ' *http://golded-plus.sf.net* \r\n' >>${dizfile} # make binaries -gmake PLATFORM=sun clean -gmake PLATFORM=sun -gmake PLATFORM=sun strip +gmake PLATFORM=${platform} clean +gmake PLATFORM=${platform} +gmake PLATFORM=${platform} strip cd docs gmake tokentpl.txt tokencfg.txt cd .. -for i in bin/gedsun bin/gnsun bin/rddtsun ; do +for i in ${bines} ; do if [ ! -f ${i} ] ; then echo "File ${i} not exists, stop!"; exit 1 ; fi done @@ -81,4 +88,4 @@ cd ../.. rm -rf $pkgdir # zipping -zip -9DXj ${name} ${dizfile} bin/$pkgname +zip -9DXj ${name} ${dizfile} ${binesdir}/$pkgname