From 22c670c3d344605058f59c4b7e9f677fe5e17694 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 13 Apr 2013 01:59:07 -0700 Subject: Replace OS X installer PackageMaker document with a distribution file and script --- build_tools/fish_shell.pmdoc/01fish-contents.xml | 1 - build_tools/fish_shell.pmdoc/01fish.xml | 1 - build_tools/fish_shell.pmdoc/index.xml | 40 --------------------- build_tools/make_pkg.sh | 31 +++------------- build_tools/osx_distribution.xml | 18 ++++++++++ .../osx_package_resources/terminal_logo.png | Bin 0 -> 51962 bytes build_tools/osx_package_resources/welcome.rtf | 25 +++++++++++++ 7 files changed, 48 insertions(+), 68 deletions(-) delete mode 100644 build_tools/fish_shell.pmdoc/01fish-contents.xml delete mode 100644 build_tools/fish_shell.pmdoc/01fish.xml delete mode 100644 build_tools/fish_shell.pmdoc/index.xml create mode 100644 build_tools/osx_distribution.xml create mode 100644 build_tools/osx_package_resources/terminal_logo.png create mode 100644 build_tools/osx_package_resources/welcome.rtf (limited to 'build_tools') diff --git a/build_tools/fish_shell.pmdoc/01fish-contents.xml b/build_tools/fish_shell.pmdoc/01fish-contents.xml deleted file mode 100644 index bc1e5a79..00000000 --- a/build_tools/fish_shell.pmdoc/01fish-contents.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/build_tools/fish_shell.pmdoc/01fish.xml b/build_tools/fish_shell.pmdoc/01fish.xml deleted file mode 100644 index efe170e1..00000000 --- a/build_tools/fish_shell.pmdoc/01fish.xml +++ /dev/null @@ -1 +0,0 @@ -com.ridiculousfish.fish-shell.fishShell.fish_pkg.pkg1.0/private/tmp/fish_pkg/parentinstallTo \ No newline at end of file diff --git a/build_tools/fish_shell.pmdoc/index.xml b/build_tools/fish_shell.pmdoc/index.xml deleted file mode 100644 index 0da74990..00000000 --- a/build_tools/fish_shell.pmdoc/index.xml +++ /dev/null @@ -1,40 +0,0 @@ -fish shellcom.ridiculousfish.fish-shell/Users/peter/Desktop/Untitled.pdf01fish.xmlproperties.titledescription \ No newline at end of file diff --git a/build_tools/make_pkg.sh b/build_tools/make_pkg.sh index 3486c2b7..1c4f70ee 100755 --- a/build_tools/make_pkg.sh +++ b/build_tools/make_pkg.sh @@ -1,31 +1,10 @@ #!/bin/sh -x make distclean -rm -rf /tmp/fish_pkg -mkdir -p /tmp/fish_pkg/ +rm -Rf /tmp/fish_pkg +mkdir -p /tmp/fish_pkg/root /tmp/fish_pkg/intermediates /tmp/fish_pkg/dst -# Make sure what we build can run on SnowLeopard -export OSX_SDK="/Developer/SDKs/MacOSX10.6.sdk" -export MACOSX_DEPLOYMENT_TARGET="10.6" -export CC="clang -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" -export CCX="clang++ -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" -export CFLAGS="$CFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" -export CXXFLAGS="$CXXFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" -export LDFLAGS="$LDFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" -autoconf -./configure +xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish_pkg/root/ +pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' /tmp/fish_pkg/intermediates/fish.pkg -# Actually build it now -if make -j 4 DESTDIR=/tmp/fish_pkg install -then - echo "Root written to /tmp/fish_pkg/" - if /Developer/usr/bin/packagemaker --doc ./build_tools/fish_shell.pmdoc --out ~/fish_built/fishfish.pkg - then - echo "Package written to ~/fish_built/fishfish.pkg" - else - echo "Package could not be written" - fi - -else - echo "Root could not be written" -fi +productbuild --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish.pkg diff --git a/build_tools/osx_distribution.xml b/build_tools/osx_distribution.xml new file mode 100644 index 00000000..1c42fecb --- /dev/null +++ b/build_tools/osx_distribution.xml @@ -0,0 +1,18 @@ + + + fish shell + + + + + + + + + + + + + + fish.pkg + diff --git a/build_tools/osx_package_resources/terminal_logo.png b/build_tools/osx_package_resources/terminal_logo.png new file mode 100644 index 00000000..68261d51 Binary files /dev/null and b/build_tools/osx_package_resources/terminal_logo.png differ diff --git a/build_tools/osx_package_resources/welcome.rtf b/build_tools/osx_package_resources/welcome.rtf new file mode 100644 index 00000000..8dca739e --- /dev/null +++ b/build_tools/osx_package_resources/welcome.rtf @@ -0,0 +1,25 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;} +{\colortbl;\red255\green255\blue255;} +{\info +{\author dlkfjslfjsfdlkfk}}\margl1440\margr1440\vieww10800\viewh8400\viewkind0 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f0\fs30 \cf0 The fish shell is a smart and user friendly command line shell. For more information on fish, visit {\field{\*\fldinst{HYPERLINK "http://fishshell.com"}}{\fldrslt http://fishshell.com}}.\ +\ +fish will be installed into +\f1\fs26 /usr/local/ +\f0\fs30 , and fish will be added to +\f1\fs26 /etc/shells +\f0\fs30 if necessary.\ +\ +Your default shell will +\i not +\i0 be changed. To make fish your default, run:\ +\ + +\f1 chsh -s /usr/local/bin/fish +\f0 \ +\ +Enjoy!\ +} \ No newline at end of file -- cgit v1.2.3