You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ab...@apache.org on 2018/12/11 14:30:45 UTC
cayenne git commit: Update cgen icon. Update dmg.
Repository: cayenne
Updated Branches:
refs/heads/master 3d3332d2e -> 371cab36b
Update cgen icon. Update dmg.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/371cab36
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/371cab36
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/371cab36
Branch: refs/heads/master
Commit: 371cab36beed351bb788255a31e2dae36de40dcd
Parents: 3d3332d
Author: Arseni Bulatski <an...@gmail.com>
Authored: Tue Dec 11 17:30:27 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Tue Dec 11 17:30:27 2018 +0300
----------------------------------------------------------------------
.../resources/assemblies/mac/background.png | Bin 4552 -> 0 bytes
.../resources/assemblies/mac/background.tiff | Bin 0 -> 153990 bytes
.../main/resources/assemblies/mac/create-dmg.sh | 30 +++++++++----------
.../cayenne/modeler/images/icon-gen_java.png | Bin 335 -> 374 bytes
4 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/371cab36/assembly/src/main/resources/assemblies/mac/background.png
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/mac/background.png b/assembly/src/main/resources/assemblies/mac/background.png
deleted file mode 100644
index a277086..0000000
Binary files a/assembly/src/main/resources/assemblies/mac/background.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/371cab36/assembly/src/main/resources/assemblies/mac/background.tiff
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/mac/background.tiff b/assembly/src/main/resources/assemblies/mac/background.tiff
new file mode 100644
index 0000000..7167658
Binary files /dev/null and b/assembly/src/main/resources/assemblies/mac/background.tiff differ
http://git-wip-us.apache.org/repos/asf/cayenne/blob/371cab36/assembly/src/main/resources/assemblies/mac/create-dmg.sh
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/mac/create-dmg.sh b/assembly/src/main/resources/assemblies/mac/create-dmg.sh
index aea236d..ee08467 100755
--- a/assembly/src/main/resources/assemblies/mac/create-dmg.sh
+++ b/assembly/src/main/resources/assemblies/mac/create-dmg.sh
@@ -3,10 +3,10 @@
# Based on https://gist.github.com/asmaloney/55d96a8c3558b2f92cb3
VERSION="$1"
-DMG_BACKGROUND_IMG="src/main/resources/assemblies/mac/background.png"
-
+DMG_BACKGROUND_IMG="src/main/resources/assemblies/mac/background.tiff"
+
APP_EXE="CayenneModeler.app/Contents/MacOS/CayenneModeler"
-
+
VOL_NAME="cayenne-$1-macosx"
DMG_TMP="target/${VOL_NAME}-temp.dmg"
DMG_FINAL="target/${VOL_NAME}.dmg"
@@ -14,18 +14,17 @@ STAGING_DIR="target/dmg-staging"
# clear out any old data
rm -rf "${STAGING_DIR}" "${DMG_TMP}" "${DMG_FINAL}"
-
+
# copy over the stuff we want in the final disk image to our staging dir
mkdir -p "${STAGING_DIR}"
cp -rpf "target/${VOL_NAME}/CayenneModeler.app" "${STAGING_DIR}"
-cp -rpf "target/${VOL_NAME}/README.txt" "${STAGING_DIR}"
cp -rpf "target/${VOL_NAME}/cayenne-${VERSION}" "${STAGING_DIR}"
# figure out how big our DMG needs to be
# assumes our contents are at least 1M!
SIZE=`du -sh "${STAGING_DIR}" | sed 's/\([0-9]*\)M\(.*\)/\1/'`
SIZE=`echo "${SIZE} + 1.0" | bc | awk '{print int($20+0.5)}'`
-
+
if [ $? -ne 0 ]; then
echo "Error: Cannot compute size of staging dir"
exit
@@ -34,9 +33,9 @@ fi
# create the temp DMG file
hdiutil create -srcfolder "${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \
-fsargs "-c c=64,a=16,e=16" -format UDRW -size ${SIZE}M "${DMG_TMP}"
-
+
echo "Created DMG: ${DMG_TMP}"
-
+
# mount it and save the device
DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \
egrep '^/dev/' | sed 1q | awk '{print $1}')
@@ -47,7 +46,7 @@ sleep 2
pushd /Volumes/"${VOL_NAME}"
ln -s /Applications
popd
-
+
# add a background image
mkdir /Volumes/"${VOL_NAME}"/.background
cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/
@@ -61,15 +60,14 @@ echo '
set current view of container window to icon view
set toolbar visible of container window to false
set statusbar visible of container window to false
- set the bounds of container window to {100, 100, 600, 450}
+ set the bounds of container window to {250, 100, 962, 690}
set viewOptions to the icon view options of container window
set arrangement of viewOptions to not arranged
- set icon size of viewOptions to 70
- set background picture of viewOptions to file ".background:background.png"
- set position of item "cayenne-'${VERSION}'" of container window to {50, 240}
- set position of item "README.txt" of container window to {360, 240}
- set position of item "CayenneModeler.app" of container window to {50, 100}
- set position of item "Applications" of container window to {360, 100}
+ set icon size of viewOptions to 98
+ set background picture of viewOptions to file ".background:background.tiff"
+ set position of item "cayenne-'${VERSION}'" of container window to {353, 437}
+ set position of item "CayenneModeler.app" of container window to {197, 191}
+ set position of item "Applications" of container window to {519, 190}
close
open
update without registering applications
http://git-wip-us.apache.org/repos/asf/cayenne/blob/371cab36/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png
index c341424..7981725 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png differ