Index: branches/blackosx/package/builddmg.sh =================================================================== --- branches/blackosx/package/builddmg.sh (revision 1643) +++ branches/blackosx/package/builddmg.sh (revision 1644) @@ -39,6 +39,7 @@ revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) +CHAMELEON_PACKAGE_NAME=${VOLUME_NAME}-${version}-r${revision} # ========================= # Start of building process @@ -51,11 +52,11 @@ echo "" # ================================= -# 1) Clean previus builded contents +# 1) Clean previous builded contents # ================================= if [ -x ${SRC_FOLDER} ]; then - echo " Deleting previus existing source folder/content " + echo " Deleting previous existing source folder/content " rm -R ${SRC_FOLDER} rm -f ${DMG_TEMP_NAME} fi @@ -75,9 +76,12 @@ ditto -xk "${pkgroot}/Icons/doc.zip" "${SRC_FOLDER}/" ditto -xk "${pkgroot}/Icons/pan.zip" "${SRC_FOLDER}/" ditto -xk "${pkgroot}/Icons/tm.zip" "${SRC_FOLDER}/" - - mv ${SYM_ROOT}/${VOLUME_NAME}.pkg ${SRC_FOLDER}/${VOLUME_NAME}.pkg - cp -r ${pkgroot}/doc/* ${SRC_FOLDER}/Documentation/ + + #mv ${SYM_ROOT}/${VOLUME_NAME}.pkg ${SRC_FOLDER}/${VOLUME_NAME}.pkg + cp -r ${SYM_ROOT}/${CHAMELEON_PACKAGE_NAME}.pkg ${SRC_FOLDER}/${CHAMELEON_PACKAGE_NAME}.pkg + #cp -r ${pkgroot}/doc/* ${SRC_FOLDER}/Documentation/ + cp -r ${SYM_ROOT%/*}/doc/BootHelp.txt ${SRC_FOLDER}/Documentation/ + cp -r ${SYM_ROOT%/*}/doc/Users_Guide0.5.pdf ${SRC_FOLDER}/Documentation/ cp -r ${pkgroot}/Configuration/PrefPanel/* ${SRC_FOLDER}/PrefPanel/ cp -r ${SYM_ROOT}/i386/* ${SRC_FOLDER}/i386/ cp -r ${SYM_ROOT%/*}/artwork/themes/* ${SRC_FOLDER}/Themes/ @@ -138,7 +142,7 @@ # 9) Make sure it's not world writeable # ===================================== - mv ${SRC_FOLDER}/${VOLUME_NAME}.pkg ${MOUNT_DIR}/${VOLUME_NAME}.pkg + mv ${SRC_FOLDER}/${CHAMELEON_PACKAGE_NAME}.pkg ${MOUNT_DIR}/${VOLUME_NAME}.pkg cp -R ${SRC_FOLDER}/Documentation ${MOUNT_DIR}/ cp -R ${SRC_FOLDER}/PrefPanel ${MOUNT_DIR}/ cp -R ${SRC_FOLDER}/i386 ${MOUNT_DIR}/ @@ -155,10 +159,10 @@ # ============================================= echo " [openUp] Setting auto open flag" -if [ -x ${OPENUP_TOOL} ]; then - echo " Applying openUp..." - ${OPENUP_TOOL} "${MOUNT_DIR}" >/dev/null 2>&1 -fi + if [ -x ${OPENUP_TOOL} ]; then + echo " Applying openUp..." + ${OPENUP_TOOL} "${MOUNT_DIR}" >/dev/null 2>&1 + fi echo " " # =========== Index: branches/blackosx/Makefile =================================================================== --- branches/blackosx/Makefile (revision 1643) +++ branches/blackosx/Makefile (revision 1644) @@ -127,9 +127,15 @@ @echo "\t[ZIP] ${DISTFILE}.pkg" @ditto -c -k --sequesterRsrc ${DISTFILE}.pkg ${DISTFILE}.zip @rm -r ${DISTFILE}.pkg + +dmg: all + ${SRCROOT}/package/slimpkg.sh ${SYMROOT}/package; + ${SRCROOT}/package/builddmg.sh ${SYMROOT}/package; .PHONY: config .PHONY: clean .PHONY: image .PHONY: pkg .PHONY: installer +.PHONY: dmg +