From 2b720eba224dfc0f2d6f072088fb5b64a97505a1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 4 Nov 2011 21:21:07 +0000 Subject: delete cruft from osx packaging folder git-svn-id: svn://localhost/ardour2/branches/3.0@10451 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/osx_packaging/Ardour2-SAE.icns | Bin 57885 -> 0 bytes tools/osx_packaging/README.rtf | 68 --------- tools/osx_packaging/app_build.rb | 270 ----------------------------------- tools/osx_packaging/mkuirc | 17 --- tools/osx_packaging/openDoc | 6 - 5 files changed, 361 deletions(-) delete mode 100644 tools/osx_packaging/Ardour2-SAE.icns delete mode 100644 tools/osx_packaging/README.rtf delete mode 100755 tools/osx_packaging/app_build.rb delete mode 100755 tools/osx_packaging/mkuirc delete mode 100755 tools/osx_packaging/openDoc (limited to 'tools') diff --git a/tools/osx_packaging/Ardour2-SAE.icns b/tools/osx_packaging/Ardour2-SAE.icns deleted file mode 100644 index 417107c899..0000000000 Binary files a/tools/osx_packaging/Ardour2-SAE.icns and /dev/null differ diff --git a/tools/osx_packaging/README.rtf b/tools/osx_packaging/README.rtf deleted file mode 100644 index dd15e66151..0000000000 --- a/tools/osx_packaging/README.rtf +++ /dev/null @@ -1,68 +0,0 @@ -{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf390 -{\fonttbl\f0\fswiss\fcharset77 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\margl1440\margr1440\vieww9000\viewh8400\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural - -\f0\fs24 \cf0 This is the Mac OS X version of Ardour (http://ardour.org)\ -\ -You don't need a lot of stuff to get Ardour running on OS X. You will need:\ -\ - * At least OS X 10.4\ -\ - * Apple's X11 which is found on your OS X install CD (or a large download)\ -\ - * JACK (either JackOSX - http://jackosx.com or "regular" JACK.) In\ - general, we recommend JackOSX for new users, specifically version\ - 0.72 or above. It should run on OS X versions 10.3.x and above,\ - including Tiger. Version 0.73 or above must be used for Mac Intel\ - universal binary support.\ -\ -See http://ardour.org/requirements_osx for more information.\ -\ -The universal binary of Ardour should run on OSX versions >= 10.4. A version\ -that also runs on Panther should also be available.\ -Please report any problems to osx-support@ardour.org or on the #ardour \ -IRC channel at irc.freenode.net. And include any output from the \ -console.log as shown in the Applications->Utilities->Console application \ -in the report.\ -\ -IMPORTANT: before starting Ardour, you should configure and start the\ -JACK server. You can either use JackPilot, which comes with the\ -JackOSX package, or you can use the more advanced QJackCtl. A disk\ -image for QJackCtl is available at http://ardour.org/requirements_osx,\ -please read the included README carefully for initial setup\ -instructions.\ -\ -Because ardour does not come with any effect plugins, we are providing\ -installable packages for some of the top LADSPA plugins sets. Please\ -download and install them from http://ardour.org/requirements_osx\ -page.\ -\ -Also see the online documentation at http://ardour.org/manual/ for\ -basic usage of the software.\ -\ -\ -FAQ\ -------------------------\ -\ -Q: When I click on the Ardour icon, the program will not start\ -\ -First, check a few basic issues:\ - 1. Are you running at least OS X 10.4 ?\ - 2. Did you install Apple's X11 application?\ - 3. Did you install a suitable version of JACK ?\ - 4. Did you start JACK running before trying to run Ardour?\ - (Typically this is done using a JACK control app like JackPilot or qjackctl.)\ -\ -If the answer is yes to all of the above\ - 1. Launch "Console", which can be found in the "Applications->Utilities" folder\ - 2. Look at the console.log in the Console app.\ - Press the "clear" button to remove any previous messages.\ - 3. Try to launch Ardour again\ - 4. Cut and paste the entire contents of the Console window\ - (including any data stored in the scrollback) into a new posting\ - in the ardour OS X forum at http://ardour.org/forums .\ - Include details of your OS version and processor type. \ -\ -} \ No newline at end of file diff --git a/tools/osx_packaging/app_build.rb b/tools/osx_packaging/app_build.rb deleted file mode 100755 index a59cb6f688..0000000000 --- a/tools/osx_packaging/app_build.rb +++ /dev/null @@ -1,270 +0,0 @@ -#!/usr/bin/env ruby - -# Ruby script for pulling together a MacOSX app bundle. - -# it will be either powerpc or i386 -versionline = `grep -m 1 '^ardour_version =' ../../SConstruct` -version = versionline.split(" = ")[1].chomp().slice(1..-2) -$stdout.printf("Version is %s\n", version) - -arch = `uname -p`.strip() -libdir = "lib_" + arch -bindir = "bin_" + arch - -ppc_libdir = "lib_powerpc" -i386_libdir = "lib_i386" -ppc_bindir = "bin_powerpc" -i386_bindir = "bin_i386" -ppc_binlib = "binlib_powerpc.zip" -i386_binlib = "binlib_i386.zip" - -#$stdout.print("libdir is '" + libdir + "'\n") - -# check for the other arch's libbin.zip -if arch == "i386" then - zipfile = ppc_binlib - `rm -rf #{ppc_libdir} #{ppc_bindir}` -else - zipfile = i386_binlib - `rm -rf #{i386_libdir} #{i386_bindir}` -end - -if File.exist?(zipfile) then - $stdout.print("Found #{zipfile} : unpacking...\n") - `unzip -aq #{zipfile}` -end - - -if File.exist?(libdir) then - # remove it - `rm -rf #{libdir}/*` - #Dir.foreach(libdir) {|x| unless ( x[0] == 46 or File.stat(libdir+"/"+x).directory?) then File.delete(libdir + "/" +x) end} -else - Dir.mkdir libdir -end - -if File.exist?(bindir) then - Dir.foreach(bindir) {|x| unless x[0] == 46 then File.delete(bindir + "/" +x) end} -else - Dir.mkdir bindir -end - -if not File.exist?(libdir+"/surfaces") then - Dir.mkdir(libdir + "/surfaces") -end - -if not File.exist?(libdir+"/vamp-plugins") then - Dir.mkdir(libdir + "/vamp-plugins") -end - - -odir = Dir.getwd -Dir.chdir("../..") - -result = `otool -L gtk2_ardour/ardour-#{version}` -results = result.split("\n") -results.delete_at(0) - -result = `otool -L libs/ardour/libardour.dylib` -results = results + result.split("\n").slice(1,result.size-1) - -result = `otool -L libs/surfaces/*/*.dylib` -results = results + result.split("\n").slice(1,result.size-1) - -result = `otool -L libs/vamp-plugins/*.dylib` -results = results + result.split("\n").slice(1,result.size-1) - -results.uniq! - -$stdout.print("Copying libs to #{libdir} ...\n"); - -results.each do |s| - s = s.split[0] - # exclude frameworks, system libraries, X11 libraries, and libjack. - unless s =~ /System|\/usr\/lib|\/usr\/X11|Jackmp|libjack|:$/ then - #$stdout.print("Copying #{s}\n") - `cp #{s} #{odir}/#{libdir}/` - end -end - -# now do it again -result = `otool -L #{odir}/#{libdir}/*.dylib` -results = result.split("\n") -results.uniq! -results.each do |s| - s = s.split[0] - # exclude frameworks, system libraries, X11 libraries, and libjack. - unless s =~ /System|\/usr\/lib|\/usr\/X11|Jackmp|libjack|:$/ then - sbase = File.basename(s) - targfile = "#{odir}/#{libdir}/#{sbase}" - #$stdout.print("Targ is : " + targfile + "\n") - if not File.exist?(targfile) then - #$stdout.print("2nd stage Copying #{s}\n") - `cp #{s} #{odir}/#{libdir}/` - end - end -end - - -Dir.chdir(odir) - -# copy ardour binary to bindir/ardour - - -if File.exist?("../../gtk2_ardour/ardour-#{version}") then - $stdout.print("Copying bin to #{bindir} ...\n"); - `cp ../../gtk2_ardour/ardour-#{version} #{bindir}/ardour` -end - -`cp ../../libs/surfaces/*/*.dylib #{libdir}/surfaces` -# remove the basenames from libdir that are in surfaces (copied earlier) -`rm -f #{libdir}/surfaces/libardour_cp.dylib` -begin - Dir.foreach(libdir+"/surfaces") {|x| unless ( x[0] == 46 or x.include?("libardour_cp")) then File.delete(libdir + "/" +x) end} -rescue -end - -# vamp plugins -`cp ../../libs/vamp-plugins/*.dylib #{libdir}/vamp-plugins` - - -# copy gtk and pango lib stuff -`cp -R /opt/local/lib/pango #{libdir}/` -`cp -R /opt/local/lib/gtk-2.0 #{libdir}/` - -# use our clearlooks -`rm -f #{libdir}/gtk-2.0/2.*/engines/libclearlooks.*` -# must use .so for it to be found :/ -`cp ../../libs/clearlooks/libclearlooks.dylib #{libdir}/gtk-2.0/2.10.0/engines/libclearlooks.so` - - -def lipo_platforms_recurse(src1, src2, target) - - if not File.stat(src1).directory? then - # normal file, lets lipo them if it doesn't already exist there - isbin = `file #{src1}`.include?("Mach-O") - if (! File.exist?(target)) and isbin then - if File.exist?(src2) then - $stdout.print("Lipo'ing " + target + "\n") - `lipo -create -output #{target} #{src1} #{src2}` - else - # just copy it - $stdout.print("Copying " + src1 + "\n") - `cp #{src1} #{target}` - end - else - #$stdout.print("Skipping " + target + "\n") - end - else - # directory, recurse if necessary - if File.exist?(src2) then - # other dir exists, recurse - - # make targetdir if necessary - if not File.exist?(target) then - Dir.mkdir(target) - end - - Dir.foreach(src1) do |file| - if file[0] != 46 then - src1file = src1 + '/' + file - src2file = src2 + '/' + file - targfile = target + '/' + file - lipo_platforms_recurse(src1file, src2file, targfile) - end - end - else - # just copy it recursively to target - $stdout.print("Copying dir " + src1 + "\n") - `cp -R #{src1} #{target}` - end - end -end - -# lipo stuff together if both platforms libs and bins are here - -if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then - $stdout.print("\nBoth platforms in place, lipo'ing...\n"); - `rm -rf lib/*` - `rm -f bin/ardour` - lipo_platforms_recurse(ppc_libdir, i386_libdir, "lib") - lipo_platforms_recurse(i386_libdir, ppc_libdir, "lib") - lipo_platforms_recurse(i386_bindir+'/ardour', ppc_bindir+'/ardour', "bin/ardour") - - # remove existing Ardour3.app - `rm -rf Ardour3.app` - - $stdout.print("\nRunning Playtpus to create Ardour3.app ...\n"); - - `/usr/local/bin/platypus -D -X 'ardour' -a 'Ardour3' -t 'shell' -o 'None' -u 'Paul Davis' -i '/bin/sh' -V "#{version}" -s 'ArDr' -I 'org.ardour.Ardour3' -f 'bin' -f 'lib' -i 'Ardour3.icns' -f 'MenuBar.nib' -f 'ProgressWindow.nib' -f 'init' -f 'openDoc' 'script' 'Ardour3.app'` - - $stdout.print("\nCopying other stuff to Ardour3.app ...\n"); - - if not File.exist?("Ardour3.app/Contents/Resources/etc") then - Dir.mkdir "Ardour3.app/Contents/Resources/etc" - end - - if not File.exist?("Ardour3.app/Contents/Resources/etc/ardour3") then - Dir.mkdir "Ardour3.app/Contents/Resources/etc/ardour3" - end - `cp ../../gtk2_ardour/ardour.bindings ../../gtk2_ardour/ardour.colors ../../gtk2_ardour/ardour.menus Ardour3.app/Contents/Resources/etc/ardour3/` - `cp ../../ardour.rc ../../ardour_system.rc Ardour3.app/Contents/Resources/etc/ardour3/` - `cp ardour3_mac_ui.rc Ardour3.app/Contents/Resources/etc/ardour3/ardour3_ui.rc` - - # copy other etc stuff - if not File.exist?("Ardour3.app/Contents/Resources/etc/gtk-2.0") then - `cp -R etc/gtk-2.0 Ardour3.app/Contents/Resources/etc/` - end - if not File.exist?("Ardour3.app/Contents/Resources/etc/pango") then - `cp -R etc/pango Ardour3.app/Contents/Resources/etc/` - end - if not File.exist?("Ardour3.app/Contents/Resources/etc/fonts") then - `cp -R /opt/local/etc/fonts Ardour3.app/Contents/Resources/etc/` - end - - if not File.exist?("Ardour3.app/Contents/Resources/etc/profile.d") then - `cp -R etc/profile.d Ardour3.app/Contents/Resources/etc/` - end - - # share stuff - - if not File.exist?("Ardour3.app/Contents/Resources/share") then - Dir.mkdir "Ardour3.app/Contents/Resources/share" - end - - if not File.exist?("Ardour3.app/Contents/Resources/share/ardour3") then - Dir.mkdir "Ardour3.app/Contents/Resources/share/ardour3" - Dir.mkdir "Ardour3.app/Contents/Resources/share/ardour3/templates" - `cp -R ../../gtk2_ardour/icons ../../gtk2_ardour/pixmaps ../../gtk2_ardour/splash.png Ardour3.app/Contents/Resources/share/ardour3/` - `cp ../../templates/*.template Ardour3.app/Contents/Resources/share/ardour3/templates/` - end - - # go through and recursively remove any .svn dirs in the bundle - svndirs = `find Ardour3.app -name .svn -type dir`.split("\n") - svndirs.each do |svndir| - `rm -rf #{svndir}` - end - - # make DMG - `rm -rf macdist` - Dir.mkdir("macdist") - `cp -r README.rtf COPYING Ardour3.app macdist/` - dmgname = "Ardour-#{version}" - `rm -f #{dmgname}.dmg` - $stdout.print("\nCreating DMG\n") - `hdiutil create -fs HFS+ -volname #{dmgname} -srcfolder macdist #{dmgname}.dmg` - - - $stdout.print("\nDone\n") - -else - # zip up libdir and bindir - zipfile = "binlib_"+`uname -p`.strip() + ".zip" - $stdout.print("Zipping up #{libdir} and #{bindir} into #{zipfile}...\n") - `zip -rq #{zipfile} #{libdir} #{bindir}` - $stdout.print("Copy #{zipfile} to other platform's osx_packaging dir and run app_build.rb\nthere to complete universal build.\n") - - -end - - diff --git a/tools/osx_packaging/mkuirc b/tools/osx_packaging/mkuirc deleted file mode 100755 index db252922b6..0000000000 --- a/tools/osx_packaging/mkuirc +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# run this from the top level to generate a new OS X specific UI RC -# file. Acts as a stdin/stdout filter - - -sed \ - -e 's/sans 11/sans 14/g' \ - -e 's/sans 10/sans 12/g' \ - -e 's/sans 9/sans 11/g' \ - -e 's/sans 8/sans 10/g' \ - -e 's/sans 7/sans 9/g' \ - -e 's/sans bold 11/sans bold 14/g' \ - -e 's/sans bold 10/sans bold 12/g' \ - -e 's/sans bold 9/sans bold 11/g' \ - -e 's/sans bold 8/sans bold 10/g' \ - -e 's/sans bold 7/sans bold 9/g' diff --git a/tools/osx_packaging/openDoc b/tools/osx_packaging/openDoc deleted file mode 100755 index 888a42b176..0000000000 --- a/tools/osx_packaging/openDoc +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine - -export "DISPLAY=`cat /tmp/$UID/TemporaryItems/display`" -exec "`dirname \"$0\"`/bin/gimp-remote" "$@" -- cgit v1.2.3