diff --git a/JournalDesModifications.pdf b/JournalDesModifications.pdf new file mode 100644 index 00000000..ca52c5d6 Binary files /dev/null and b/JournalDesModifications.pdf differ diff --git a/ReleaseNotes.pdf b/ReleaseNotes.pdf new file mode 100644 index 00000000..4d86e6e7 Binary files /dev/null and b/ReleaseNotes.pdf differ diff --git a/buildDebianPackage b/buildDebianPackage index 0b0871eb..5835b9bf 100755 --- a/buildDebianPackage +++ b/buildDebianPackage @@ -15,12 +15,19 @@ # --------------------------------------------------------------------- MAKE_TAG=true +CREATE_DIENA_DISTRIBUTION_ZIP=false -if [ $# == "1" ]; then - if [ $1 == "notag" ]; then + +for var in "$@" +do + if [ $var == "notag" ]; then MAKE_TAG=false; fi -fi + if [ $var == "diena" ]; then + CREATE_DIENA_DISTRIBUTION_ZIP=true; + fi +done + notifyError(){ notify-send -t 0 "Error occoured" "An error occours during the sankore build:\n\t$1" -i /usr/share/icons/oxygen/64x64/status/dialog-error.png @@ -39,7 +46,6 @@ alertIfPreviousVersionInstalled(){ fi } - alertIfPreviousVersionInstalled @@ -318,11 +324,23 @@ chmod 755 "$BASE_WORKING_DIR/DEBIAN/prerm" chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint" mkdir -p "install/linux" +DEBIAN_PACKAGE_NAME="Open-Sankore_${VERSION}_$ARCHITECTURE.deb" fakeroot chown -R root:root $BASE_WORKING_DIR -dpkg -b "$BASE_WORKING_DIR" install/linux/Open-Sankore_${VERSION}_$ARCHITECTURE.deb +dpkg -b "$BASE_WORKING_DIR" "install/linux/$DEBIAN_PACKAGE_NAME" notify-send "Open-Sankore" "Package built" #clean up mess fakeroot rm -rf $BASE_WORKING_DIR + +if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then + + ZIP_NAME="Open-Sankoré_`lsb_release -is`_`lsb_release -rs`_${VERSION}_${ARCHITECTURE}.zip" + cd install/linux + `which zip` -1 --junk-paths ${ZIP_NAME} ${DEBIAN_PACKAGE_NAME} ../../ReleaseNotes.pdf ../../JournalDesModifications.pdf + cd - + + notify-send "Open-Sankore" "Build Diena zip file for distribution" +fi + diff --git a/buildDebianPackageQmake-Qt4 b/buildDebianPackageQmake-Qt4 index 730c4b0d..83bf90c1 100755 --- a/buildDebianPackageQmake-Qt4 +++ b/buildDebianPackageQmake-Qt4 @@ -21,13 +21,18 @@ notifyError(){ } MAKE_TAG=true +CREATE_DIENA_DISTRIBUTION_ZIP=false -if [ $# == "1" ]; then - if [ $1 == "notag" ]; then + +for var in "$@" +do + if [ $var == "notag" ]; then MAKE_TAG=false; fi -fi - + if [ $var == "diena" ]; then + CREATE_DIENA_DISTRIBUTION_ZIP=true; + fi +done alertIfPreviousVersionInstalled(){ APT_CACHE=`which apt-cache` @@ -320,11 +325,21 @@ chmod 755 "$BASE_WORKING_DIR/DEBIAN/prerm" chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint" mkdir -p "install/linux" +DEBIAN_PACKAGE_NAME="Open-Sankore_${VERSION}_$ARCHITECTURE.deb" fakeroot chown -R root:root $BASE_WORKING_DIR -dpkg -b "$BASE_WORKING_DIR" install/linux/Open-Sankore_${VERSION}_$ARCHITECTURE.deb +dpkg -b "$BASE_WORKING_DIR" "install/linux/$DEBIAN_PACKAGE_NAME" notify-send "Open-Sankore" "Package built" #clean up mess fakeroot rm -rf $BASE_WORKING_DIR +if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then + + ZIP_NAME="Open-Sankoré_`lsb_release -is`_`lsb_release -rs`_${VERSION}_${ARCHITECTURE}.zip" + cd install/linux + `which zip` -1 --junk-paths ${ZIP_NAME} ${DEBIAN_PACKAGE_NAME} ../../ReleaseNotes.pdf ../../JournalDesModifications.pdf + cd - + + notify-send "Open-Sankore" "Build Diena zip file for distribution" +fi \ No newline at end of file