From 41fd960e499720974fa4d82263f66a273e9ef283 Mon Sep 17 00:00:00 2001 From: Branson Perreault Date: Thu, 22 Sep 2016 21:17:41 -0600 Subject: [PATCH 1/3] Test commit please ignore --- setup_development_macosx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_development_macosx.sh b/setup_development_macosx.sh index 2189e70..16f2e0d 100755 --- a/setup_development_macosx.sh +++ b/setup_development_macosx.sh @@ -23,7 +23,7 @@ python -m compileall venv/lib/python2.7/site-packages/google/ brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gstreamer pip install pygame -pip install --upgrade --user python -r requirements.txt +pip install --upgrade -r requirements.txt if [ $? != 0 ]; then echo -e "${FRED}FAILED TO INSTALL REQUIREMENTS{RS}" exit 59 From 20d927ff6ac5cfc9fae3015bb0f31deaa58cdc07 Mon Sep 17 00:00:00 2001 From: Branson Perreault Date: Thu, 22 Sep 2016 21:26:55 -0600 Subject: [PATCH 2/3] Add create-dmg as submodule --- .gitmodules | 3 +++ create-dmg | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 create-dmg diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ae2e17f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "create-dmg"] + path = create-dmg + url = https://github.com/andreyvit/create-dmg diff --git a/create-dmg b/create-dmg new file mode 160000 index 0000000..5acf22f --- /dev/null +++ b/create-dmg @@ -0,0 +1 @@ +Subproject commit 5acf22fa87e1b751701f377efddc7429877ecb0a From dcf5f564d8f902323d590c7f4b39d6fbf9225d2d Mon Sep 17 00:00:00 2001 From: Branson Perreault Date: Thu, 22 Sep 2016 21:30:01 -0600 Subject: [PATCH 3/3] Modify create-dmg path to use new submodule --- build_mac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_mac.sh b/build_mac.sh index 0d05d97..b733594 100755 --- a/build_mac.sh +++ b/build_mac.sh @@ -117,7 +117,7 @@ sym_pos_x=600 sym_pos_y=200 icon_size=64 -/opt/git/create-dmg/create-dmg --volicon $volicon --volname $vol_name --background $background_image --window-pos 200 120 --window-size $backgound_width $background_height --icon-size $icon_size --icon $app $app_pos_x $app_pos_y --app-drop-link $sym_pos_x $sym_pos_y --hide-extension $app $dmg_name PeachyPrinter.app +create-dmg/create-dmg --volicon $volicon --volname $vol_name --background $background_image --window-pos 200 120 --window-size $backgound_width $background_height --icon-size $icon_size --icon $app $app_pos_x $app_pos_y --app-drop-link $sym_pos_x $sym_pos_y --hide-extension $app $dmg_name PeachyPrinter.app -deactivate \ No newline at end of file +deactivate