added fontpaths to the pd-settings files

svn path=/trunk/; revision=4819

1 files changed, 65 insertions, 8 deletions

diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index cf2da3fc..f31919c8 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,16 +1,22 @@
 #!/bin/sh
 
-LIBS="Gem cyclone zexy cxc ext13 fftease hid iemabs iemmatrix liblist list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vasp vbap xsample"
+LIBS="Gem cyclone zexy cxc ext13 fftease hid iemabs iemmatrix liblist list-abs mapping markex maxlib memento mjlib motex mtx oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vasp vbap xsample"
 
+GNULINUX_FONTPATH="/usr/X11R6/lib/X11/fonts /usr/X11R6/lib/X11/fonts/TTF /usr/lib/X11/fonts /usr/share/fonts/truetype"
+MACOSX_FONTPATH="/System/Library/Fonts /Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf"
+WINDOWS_FONTPATH="%SystemRoot%/Fonts"
 
 ROOT_DIR=~/cvs/pure-data/packages
 
-GNULINUX_FILE=${ROOT_DIR}/linux_make/pdsettings
+GNULINUX_FILE=${ROOT_DIR}/linux_make/.pdsettings
 MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.plist
 WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
 
 
-MACOSX_HEADER='<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>'
+GNULINUX_HEADER='standardpath: 1\nverbose: 0'
+
+
+MACOSX_HEADER='<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n\t<key>defeatrt</key>\n\t<string>1</string>'
 MACOSX_FOOTER='</dict>\n
 </plist>\n'
 
@@ -18,36 +24,87 @@ MACOSX_FOOTER='</dict>\n
 WINDOWS_HEADER='Windows Registry Editor Version 5.00\n\n[HKEY_LOCAL_MACHINE\SOFTWARE\Pd]'
 
 
-#echo -e $GNULINUX_HEADER > $GNULINUX_FILE
+echo -e $GNULINUX_HEADER > $GNULINUX_FILE
 echo -e $MACOSX_HEADER > $MACOSX_FILE
 echo -e $WINDOWS_HEADER > $WINDOWS_FILE
 
+# GNU/Linux -------------------------------------------------------------------#
+function print_gnulinux ()
+{
+	 echo "loadlib$1: $2" >> $GNULINUX_FILE
+}
+
+function print_gnulinux_fontpath ()
+{
+	 i=0
+	 for fontpath in $GNULINUX_FONTPATH; do
+		  ((++i)) 
+		  echo "path${i}: ${fontpath}" >> $GNULINUX_FILE
+	 done
+}
+
+function print_gnulinux_footer ()
+{
+	 echo "nloadlib: $1" >> $GNULINUX_FILE
+}
+
+# Mac OS X --------------------------------------------------------------------#
 function print_macosx () 
 {
 	 echo -e "\t<key>loadlib$1</key>" >> $MACOSX_FILE
 	 echo -e "\t<string>$2</string>" >> $MACOSX_FILE
 }
 
+function print_macosx_fontpath ()
+{
+	 i=0
+	 for fontpath in $MACOSX_FONTPATH; do
+		  ((++i)) 
+		  echo -e "\t<key>path${i}</key>" >> $MACOSX_FILE
+		  echo -e "\t<string>${fontpath}</string>" >> $MACOSX_FILE
+	 done
+}
+
+# Windows ---------------------------------------------------------------------#
 function print_windows ()
 {
 	 echo "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
 }
 
+function print_windows_fontpath ()
+{
+	 i=0
+	 for fontpath in $WINDOWS_FONTPATH; do
+		  ((++i)) 
+		  echo "\"path${i}\"=\"${fontpath}\"" >> $WINDOWS_FILE
+	 done
+}
+
 function print_windows_delete ()
 {
 	 echo "\"${1}${2}\"=\"-\"" >> $WINDOWS_FILE
 }
 
+#==============================================================================#
 
-i=1
+i=0
 for lib in $LIBS; do
+	 ((++i)) 
 	 echo -n "$lib "
+	 print_gnulinux $i $lib
 	 print_macosx $i $lib
 	 print_windows $i $lib
-	 ((++i)) 
 done
 echo " "
 
+# the .pd-settings file needs an end tag for the loadlib statements
+print_gnulinux_fontpath
+print_gnulinux_footer $i
+
+print_macosx_fontpath
+echo -e $MACOSX_FOOTER >> $MACOSX_FILE
+
+
 # print lines to delete existing loadlib flags
 echo "; delete any previous loadlib flags" >> $WINDOWS_FILE
 while [ $i -lt 50 ]; do
@@ -55,7 +112,8 @@ while [ $i -lt 50 ]; do
 	 ((++i)) 
 done
 
-i=1
+print_windows_fontpath
+
 # print lines to delete existing path flags
 echo "; delete all existing path flags" >> $WINDOWS_FILE
 while [ $i -lt 50 ]; do
@@ -63,4 +121,3 @@ while [ $i -lt 50 ]; do
 	 ((++i)) 
 done
 
-echo -e $MACOSX_FOOTER >> $MACOSX_FILE