From 9eb00667647f4d0fbce807f734a167655a273765 Mon Sep 17 00:00:00 2001 From: skarg Date: Sat, 10 Mar 2012 21:33:57 +0000 Subject: [PATCH] Fixed release files. --- bacnet-stack/build.sh | 2 +- bacnet-stack/release-branch.sh | 63 +++++++++++++++++++++------------- bacnet-stack/release.sh | 52 ++++++++++++++++++---------- 3 files changed, 74 insertions(+), 43 deletions(-) diff --git a/bacnet-stack/build.sh b/bacnet-stack/build.sh index fb432e66..cd492de7 100755 --- a/bacnet-stack/build.sh +++ b/bacnet-stack/build.sh @@ -7,7 +7,7 @@ CC=gcc AR=ar MAKE=make export CC AR MAKE -make BACNET_PORT=win32 BUILD=release clean all +make BACNET_PORT=win32 BUILD=release clean all > /dev/null # Build for MinGW debug # make BACNET_PORT=win32 BUILD=debug clean all diff --git a/bacnet-stack/release-branch.sh b/bacnet-stack/release-branch.sh index 10606aa0..cce32ab9 100644 --- a/bacnet-stack/release-branch.sh +++ b/bacnet-stack/release-branch.sh @@ -23,14 +23,17 @@ echo "Creating the ${TAGGED_VERSION_DOTTED} release files for $(BRANCH_VERSION_D CHANGELOG=ChangeLog-${TAGGED_VERSION_DOTTED} echo "Creating the ${PROJECT} change log ${CHANGELOG}" -rm ${CHANGELOG} -svn update -svn log --xml --verbose | xsltproc svn2cl.xsl - > ${CHANGELOG} -if [ -z "${CHANGELOG}" ] +if [ -e "${CHANGELOG}" ] +then +rm ${CHANGELOG} +fi +svn update +svn log --xml --verbose | xsltproc svn2cl.xsl - > ${CHANGELOG} > /dev/null +if [ -e "${CHANGELOG}" ] then -echo "Failed to create ${CHANGELOG}" -else echo "${CHANGELOG} created." +else +echo "Failed to create ${CHANGELOG}" fi BRANCH_NAME=${SVN_MODULE}-${BRANCH_VERSION_DASHED} @@ -41,40 +44,52 @@ SVN_BASE_URL=https://${PROJECT}.svn.sourceforge.net/svnroot/${PROJECT} SVN_BRANCH_NAME=${SVN_BASE_URL}/branches/releases/${BRANCH_NAME} SVN_TAGGED_NAME=${SVN_BASE_URL}/tags/${TAGGED_NAME} echo "Setting a tag on the ${SVN_MODULE} module called ${TAGGED_NAME}" -svn copy ${SVN_BRANCH_NAME} ${SVN_TAGGED_NAME} -m "Created version ${ARCHIVE_NAME}" +SVN_MESSAGE="Created version ${ARCHIVE_NAME}" +svn copy ${SVN_BRANCH_NAME} ${SVN_TAGGED_NAME} -m ${SVN_MESSAGE} > /dev/null echo "done." -echo "Getting a clean version out of subversion for Linux gzip" -svn export ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} -echo "done." - -GZIP_FILENAME=${ARCHIVE_NAME}.tgz -echo "tar and gzip the clean directory" -tar -cvvzf ${GZIP_FILENAME} ${ARCHIVE_NAME}/ -echo "done." - -if [ -z "${GZIP_FILENAME}" ] +if [ -e "${ARCHIVE_NAME}" ] +then +rm -rf ${ARCHIVE_NAME} +fi +echo "Getting a clean version out of subversion for Linux gzip" +svn export ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} > /dev/null +echo "done." +GZIP_FILENAME=${ARCHIVE_NAME}.tgz +if [ -e "${GZIP_FILENAME}" ] +then +rm ${GZIP_FILENAME} +fi +echo "tar and gzip the clean directory" +tar -cvvzf ${GZIP_FILENAME} ${ARCHIVE_NAME}/ > /dev/null +echo "done." + +if [ -e "${GZIP_FILENAME}" ] then -echo "Failed to create ${GZIP_FILENAME}" -else echo "${GZIP_FILENAME} created." +else +echo "Failed to create ${GZIP_FILENAME}" fi echo "Removing the directory exported for Linux." rm -rf ${ARCHIVE_NAME} echo "Getting another clean version out of subversion for Windows zip" -svn export --native-eol CRLF ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} +if [ -e "${ZIP_FILENAME}" ] +then +rm ${ZIP_FILENAME} +fi +svn export --native-eol CRLF ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} > /dev/null ZIP_FILENAME=${ARCHIVE_NAME}.zip echo "done." echo "Zipping the directory exported for Windows." -zip -r ${ZIP_FILENAME} ${ARCHIVE_NAME} +zip -r ${ZIP_FILENAME} ${ARCHIVE_NAME} > /dev/null -if [ -z "${ZIP_FILENAME}" ] +if [ -e "${ZIP_FILENAME}" ] then -echo "Failed to create ${ZIP_FILENAME}" -else echo "${ZIP_FILENAME} created." +else +echo "Failed to create ${ZIP_FILENAME}" fi echo "Removing the directory exported for Windows." diff --git a/bacnet-stack/release.sh b/bacnet-stack/release.sh index fcca9187..396afb41 100755 --- a/bacnet-stack/release.sh +++ b/bacnet-stack/release.sh @@ -21,14 +21,17 @@ echo "Creating the release files for version ${DOTTED_VERSION}" CHANGELOG=ChangeLog-${DOTTED_VERSION} echo "Creating the ${PROJECT} change log ${CHANGELOG}" +if [ -e "${CHANGELOG}" ] +then rm ${CHANGELOG} +fi svn update svn log --xml --verbose | xsltproc svn2cl.xsl - > ${CHANGELOG} -if [ -z "${CHANGELOG}" ] +if [ -e "${CHANGELOG}" ] then -echo "Failed to create ${CHANGELOG}" -else echo "${CHANGELOG} created." +else +echo "Failed to create ${CHANGELOG}" fi ARCHIVE_NAME=${SVN_MODULE}-${DOTTED_VERSION} @@ -38,42 +41,55 @@ SVN_BASE_URL=https://${PROJECT}.svn.sourceforge.net/svnroot/${PROJECT} SVN_TRUNK_NAME=${SVN_BASE_URL}/trunk/${SVN_MODULE} SVN_TAGGED_NAME=${SVN_BASE_URL}/tags/${TAGGED_NAME} echo "Setting a tag on the ${SVN_MODULE} module called ${TAGGED_NAME}" -svn copy ${SVN_TRUNK_NAME} ${SVN_TAGGED_NAME} -m "Created version ${ARCHIVE_NAME}" +SVN_MESSAGE="Created version ${ARCHIVE_NAME}" +svn copy ${SVN_TRUNK_NAME} ${SVN_TAGGED_NAME} -m ${SVN_MESSAGE} > /dev/null echo "done." +if [ -e "${ARCHIVE_NAME}" ] +then +rm -rf ${ARCHIVE_NAME} +fi echo "Getting a clean version out of subversion for Linux gzip" -svn export ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} +svn export ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} > /dev/null echo "done." GZIP_FILENAME=${ARCHIVE_NAME}.tgz echo "tar and gzip the clean directory" -tar -cvvzf ${GZIP_FILENAME} ${ARCHIVE_NAME}/ -echo "done." - -if [ -z "${GZIP_FILENAME}" ] +if [ -e "${GZIP_FILENAME}" ] +then +rm ${GZIP_FILENAME} +fi +tar -cvvzf ${GZIP_FILENAME} ${ARCHIVE_NAME}/ > /dev/null +echo "done." +if [ -e "${GZIP_FILENAME}" ] then -echo "Failed to create ${GZIP_FILENAME}" -else echo "${GZIP_FILENAME} created." +else +echo "Failed to create ${GZIP_FILENAME}" fi +if [ -e "${ARCHIVE_NAME}" ] +then rm -rf ${ARCHIVE_NAME} - +fi echo "Getting another clean version out of subversion for Windows zip" -svn export --native-eol CRLF ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} +svn export --native-eol CRLF ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} > /dev/null ZIP_FILENAME=${ARCHIVE_NAME}.zip echo "done." echo "Zipping the directory exported for Windows." -zip -r ${ZIP_FILENAME} ${ARCHIVE_NAME} - -if [ -z "${ZIP_FILENAME}" ] +zip -r ${ZIP_FILENAME} ${ARCHIVE_NAME} > /dev/null +if [ -e "${ZIP_FILENAME}" ] then -echo "Failed to create ${ZIP_FILENAME}" -else echo "${ZIP_FILENAME} created." +else +echo "Failed to create ${ZIP_FILENAME}" fi +# remove SVN files +if [ -e "${ARCHIVE_NAME}" ] +then rm -rf ${ARCHIVE_NAME} +fi echo "Creating ${ARCHIVE_NAME}" mkdir ${ARCHIVE_NAME}