Revision: 9817 http://pure-data.svn.sourceforge.net/pure-data/?rev=9817&view=rev Author: eighthave Date: 2008-05-15 16:29:24 -0700 (Thu, 15 May 2008)

Log Message: ----------- added npath and nloadlib to stop CPU spike at load; added ~/pd/ and ~/Library/Pd for user-specific install paths. What to do on Windows...

Modified Paths: -------------- trunk/packages/darwin_app/org.puredata.pd.default.plist trunk/packages/linux_make/default.pdsettings trunk/packages/win32_inno/pd-inno.iss.in trunk/packages/win32_inno/pd-settings.reg trunk/scripts/generate-pd-settings-files.sh

Modified: trunk/packages/darwin_app/org.puredata.pd.default.plist =================================================================== --- trunk/packages/darwin_app/org.puredata.pd.default.plist 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/darwin_app/org.puredata.pd.default.plist 2008-05-15 23:29:24 UTC (rev 9817) @@ -84,24 +84,30 @@ <string>pdp</string> <key>loadlib39</key> <string>pidip</string> + <key>nloadlib</key> + <string>39</string> <key>path1</key> + <string>~/Library/Pd</string> + <key>path2</key> <string>/Library/Pd</string> - <key>path2</key> + <key>path3</key> <string>/System/Library/Fonts</string> - <key>path3</key> + <key>path4</key> <string>/Library/Fonts</string> - <key>path4</key> + <key>path5</key> <string>~/Library/Fonts</string> - <key>path5</key> + <key>path6</key> <string>/usr/X11R6/lib/X11/fonts/TTF</string> - <key>path6</key> + <key>path7</key> <string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string> - <key>path7</key> + <key>path8</key> <string>/sw/lib/X11/fonts/msttf</string> - <key>path8</key> + <key>path9</key> <string>/sw/lib/X11/fonts/intl/TrueType</string> - <key>path9</key> + <key>path10</key> <string>/sw/lib/X11/fonts/applettf</string> + <key>npath</key> + <string>10</string> </dict> </plist>

Modified: trunk/packages/linux_make/default.pdsettings =================================================================== --- trunk/packages/linux_make/default.pdsettings 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/linux_make/default.pdsettings 2008-05-15 23:29:24 UTC (rev 9817) @@ -41,6 +41,8 @@ loadlib37: deprecated loadlib38: pdp loadlib39: pidip -path1: /usr/share/pd -path2: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType nloadlib: 39 +path1: ~/pd +path2: /usr/share/pd +path3: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType +npath: 3

Modified: trunk/packages/win32_inno/pd-inno.iss.in =================================================================== --- trunk/packages/win32_inno/pd-inno.iss.in 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/win32_inno/pd-inno.iss.in 2008-05-15 23:29:24 UTC (rev 9817) @@ -66,7 +66,6 @@ Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: noerror uninsdeletekey; Tasks: fileassociations ; ; add pd-inno_registry after this comment: - Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib2; ValueData: Gem; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib3; ValueData: cyclone; Tasks: libs @@ -104,6 +103,7 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: ekext; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib36; ValueData: flatspace; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib37; ValueData: deprecated; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: 37; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib38; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib39; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib40; Flags: deletevalue; Tasks: libs @@ -168,6 +168,7 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib99; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib100; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path1; ValueData: 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; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: 1; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path2; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path3; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path4; Flags: deletevalue; Tasks: libs

Modified: trunk/packages/win32_inno/pd-settings.reg =================================================================== --- trunk/packages/win32_inno/pd-settings.reg 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/packages/win32_inno/pd-settings.reg 2008-05-15 23:29:24 UTC (rev 9817) @@ -38,6 +38,7 @@ "loadlib35"="ekext" "loadlib36"="flatspace" "loadlib37"="deprecated" +"nloadlib"=37 ; delete any previous loadlib flags "loadlib38"=- "loadlib39"=- @@ -103,6 +104,7 @@ "loadlib99"=- "loadlib100"=- "path1"=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 +"npath"=1 ; delete all existing path flags "path2"=- "path3"=-

Modified: trunk/scripts/generate-pd-settings-files.sh =================================================================== --- trunk/scripts/generate-pd-settings-files.sh 2008-05-15 22:58:01 UTC (rev 9816) +++ trunk/scripts/generate-pd-settings-files.sh 2008-05-15 23:29:24 UTC (rev 9817) @@ -49,9 +49,10 @@ ((++i)) echo "path${i}: ${fontpath}" >> $GNULINUX_FILE done + echo "npath: ${i}" >> $GNULINUX_FILE }

-print_gnulinux_footer () +print_gnulinux_nloadlib () { echo "nloadlib: $1" >> $GNULINUX_FILE } @@ -71,8 +72,16 @@ echo -e "\t<key>path${i}</key>" >> $MACOSX_FILE echo -e "\t<string>${fontpath}</string>" >> $MACOSX_FILE done + echo -e "\t<key>npath</key>" >> $MACOSX_FILE + echo -e "\t<string>${i}</string>" >> $MACOSX_FILE }

+print_macosx_nloadlib () +{ + echo -e "\t<key>nloadlib</key>" >> $MACOSX_FILE + echo -e "\t<string>${1}</string>" >> $MACOSX_FILE +} + # Windows ---------------------------------------------------------------------# print_windows () { @@ -88,6 +97,8 @@ echo ""path${j}"=${fontpath}" >> $WINDOWS_FILE echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path${j}; ValueData: ${fontpath}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE done + echo ""npath"=${j}" >> $WINDOWS_FILE + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: ${j}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE }

print_windows_delete () @@ -96,6 +107,11 @@ echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs" >> $WINDOWS_INNO_FILE }

+print_windows_nloadlib () +{ + echo ""nloadlib"=${1}" >> $WINDOWS_FILE + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: ${1}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE +} #==============================================================================#

echo "Running for GNU/Linux and Darwin:" @@ -108,8 +124,8 @@ done echo " "

-# the .pdsettings file needs a terminator with the lib count -linux_end_count=$i +print_gnulinux_nloadlib $i +print_macosx_nloadlib $i

# run separately so some libs can be excluded on Windows echo "Running for Windows:" @@ -126,6 +142,7 @@ esac done echo " " +print_windows_nloadlib $i

# print lines to delete existing loadlib flags echo "; delete any previous loadlib flags" >> $WINDOWS_FILE @@ -144,9 +161,8 @@ print_windows_delete path $i done

-# the .pd-settings file needs an end tag for the loadlib statements +# the .pd-settings file needs an end tag for the path statements print_gnulinux_fontpath -print_gnulinux_footer $linux_end_count

print_macosx_fontpath echo -e $MACOSX_FOOTER >> $MACOSX_FILE

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.