[PD-cvs] scripts generate-pd-settings-files.sh,1.21,1.22

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14749

Modified Files:
	generate-pd-settings-files.sh 
Log Message:
updated to load libdir first, so it'll actually load the rest of the libdirs properly afterwards; wrote the generating script in the process to ignore pdp and pidip on windows

Index: generate-pd-settings-files.sh
===================================================================
RCS file: /cvsroot/pure-data/scripts/generate-pd-settings-files.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** generate-pd-settings-files.sh	29 Aug 2007 15:38:32 -0000	1.21
--- generate-pd-settings-files.sh	25 Sep 2007 22:25:22 -0000	1.22
***************
*** 1,8 ****
  #!/bin/sh
  
! LIBS="Gem cyclone zexy creb cxc ggee iemlib list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap pan freeverb hcs jmmmp ext13 hardware deprecated flatspace iem_anything pdp pidip flib ekext"
  
  GNULINUX_FONTPATH="/usr/share/pd /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
  MACOSX_FONTPATH="/Library/Pd /System/Library/Fonts /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="hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00"
  
--- 1,9 ----
  #!/bin/sh
  
! LIBS="libdir Gem cyclone zexy creb cxc ggee iemlib list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap pan freeverb hcs jmmmp ext13 hardware deprecated flatspace iem_anything pdp pidip flib ekext"
  
  GNULINUX_FONTPATH="/usr/share/pd /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
  MACOSX_FONTPATH="/Library/Pd /System/Library/Fonts /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"
+ # TODO this needs to be changed to add to a user dir like %USERPROFILE% (like /Library/Pd)
  WINDOWS_FONTPATH="hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00"
  
***************
*** 13,17 ****
  MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.plist
  WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
! 
  
  GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags: -helppath /usr/share/pd'
--- 14,18 ----
  MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.plist
  WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
! WINDOWS_INNO_FILE=${ROOT_DIR}/win32_inno/pd-inno_registry.reg
  
  GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags: -helppath /usr/share/pd'
***************
*** 26,32 ****
--- 27,39 ----
  
  
+ # the file associations should be added here
+ WINDOWS_INNO_HEADER=''
+ 
+ 
  echo -e $GNULINUX_HEADER > $GNULINUX_FILE
  echo -e $MACOSX_HEADER > $MACOSX_FILE
  echo -e $WINDOWS_HEADER > $WINDOWS_FILE
+ echo -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_FILE
+ 
  
  # GNU/Linux -------------------------------------------------------------------#
***************
*** 71,74 ****
--- 78,82 ----
  {
  	 echo "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
+ 	 echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib$1; ValueData: $2; Tasks: libs"  >> $WINDOWS_INNO_FILE
  }
  
***************
*** 79,82 ****
--- 87,91 ----
  		  ((++j)) 
  		  echo "\"path${j}\"=${fontpath}" >> $WINDOWS_FILE
+ 		  echo "\"path${j}\"=${fontpath}" >> $WINDOWS_INNO_FILE
  	 done
  }
***************
*** 85,92 ****
--- 94,103 ----
  {
  	 echo "\"${1}${2}\"=-" >> $WINDOWS_FILE
+ 	 echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs"  >> $WINDOWS_INNO_FILE
  }
  
  #==============================================================================#
  
+ echo "Running for GNU/Linux and Darwin:"
  i=0
  for lib in $LIBS; do
***************
*** 95,99 ****
  	 print_gnulinux $i $lib
  	 print_macosx $i $lib
- 	 print_windows $i $lib
  done
  echo " "
--- 106,109 ----
***************
*** 102,105 ****
--- 112,131 ----
  linux_end_count=$i
  
+ # run separately so some libs can be excluded on Windows
+ echo "Running for Windows:"
+ i=0
+ for lib in $LIBS; do
+ 	 case "$lib" in
+ 		  pdp) echo -n "(ignoring $lib on Windows) " ;;
+ 		  pidip) echo -n "(ignoring $lib on Windows) " ;;
+ 		  *)
+ 				echo -n "$lib "
+ 				((++i)) 
+ 				print_windows $i $lib
+ 				;;
+ 	 esac
+ done
+ echo " "
+ 
  # print lines to delete existing loadlib flags
  echo "; delete any previous loadlib flags" >> $WINDOWS_FILE