Revision: 9844 http://pure-data.svn.sourceforge.net/pure-data/?rev=9844&view=rev Author: eighthave Date: 2008-05-18 05:42:25 -0700 (Sun, 18 May 2008)

Log Message: ----------- - added new user-specific path to the helppath

- sorted out the InnoSetup REG_EXPAND_SZ vs. the .reg file's REG_SZ with hex. Basically, when Windows imports a .reg, it converts a REG_SZ hex to a REG_EXPAND_SZ. For InnoSetup, it does not do that. Pd cannot read the REG_SZ hex format, so Inno needs to install a REG_EXPAND_SZ with a normal string for the path.

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

Modified: branches/pd-extended/v0-40/packages/darwin_app/org.puredata.pd.default.plist =================================================================== --- branches/pd-extended/v0-40/packages/darwin_app/org.puredata.pd.default.plist 2008-05-18 11:28:59 UTC (rev 9843) +++ branches/pd-extended/v0-40/packages/darwin_app/org.puredata.pd.default.plist 2008-05-18 12:42:25 UTC (rev 9844) @@ -5,7 +5,7 @@ <key>defeatrt</key> <string>0</string> <key>flags</key> - <string>-helppath /Library/Pd</string> + <string>-helppath ~/Library/Pd -helppath /Library/Pd</string> <key>loadlib1</key> <string>libdir</string> <key>loadlib2</key> @@ -111,5 +111,6 @@ <key>npath</key> <string>10</string> </dict> - </plist>

+</plist> +

Modified: branches/pd-extended/v0-40/packages/linux_make/default.pdsettings =================================================================== --- branches/pd-extended/v0-40/packages/linux_make/default.pdsettings 2008-05-18 11:28:59 UTC (rev 9843) +++ branches/pd-extended/v0-40/packages/linux_make/default.pdsettings 2008-05-18 12:42:25 UTC (rev 9844) @@ -1,7 +1,7 @@ standardpath: 1 verbose: 0 defeatrt: 0 -flags: -helppath /usr/share/pd +flags: -helppath ~/pd -helppath /usr/share/pd loadlib1: libdir loadlib2: hexloader loadlib3: Gem

Modified: branches/pd-extended/v0-40/packages/win32_inno/pd-inno.iss.in =================================================================== --- branches/pd-extended/v0-40/packages/win32_inno/pd-inno.iss.in 2008-05-18 11:28:59 UTC (rev 9843) +++ branches/pd-extended/v0-40/packages/win32_inno/pd-inno.iss.in 2008-05-18 12:42:25 UTC (rev 9844) @@ -67,6 +67,7 @@ ; ; add pd-inno_registry after this comment:

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: flags; ValueData: -helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib2; ValueData: hexloader; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib3; ValueData: Gem; Tasks: libs @@ -168,9 +169,9 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib98; Flags: deletevalue; Tasks: libs 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: path2; ValueData: hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,2f,00,41,00,70,00,70,00,6c,00,69,00,63,00,61,00,74,00,69,00,6f,00,6e,00,20,00,44,00,61,00,74,00,61,00,2f,00,50,00,64,00,00,00; Tasks: libs; Flags: uninsdeletekey -Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path3; 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: expandsz; ValueName: path1; ValueData: %USERPROFILE%/Application Data/Pd; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path2; ValueData: %ProgramFiles%/Common Files/Pd; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path3; ValueData: %SystemRoot%/Fonts; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: 3; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path4; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path5; Flags: deletevalue; Tasks: libs @@ -270,6 +271,210 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path99; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path100; Flags: deletevalue; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: flags; ValueData: -helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib2; ValueData: hexloader; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib3; ValueData: Gem; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib4; ValueData: cyclone; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib5; ValueData: zexy; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib6; ValueData: creb; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib7; ValueData: cxc; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib8; ValueData: iemlib; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib9; ValueData: list-abs; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib10; ValueData: mapping; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib11; ValueData: markex; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib12; ValueData: maxlib; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib13; ValueData: memento; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib14; ValueData: mjlib; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib15; ValueData: motex; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib16; ValueData: oscx; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib17; ValueData: pddp; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib18; ValueData: pdogg; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib19; ValueData: pixeltango; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib20; ValueData: pmpd; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib21; ValueData: rradical; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib22; ValueData: sigpack; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib23; ValueData: smlib; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib24; ValueData: toxy; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib25; ValueData: unauthorized; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib26; ValueData: vbap; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib27; ValueData: pan; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib28; ValueData: freeverb; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib29; ValueData: hcs; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib30; ValueData: jmmmp; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib31; ValueData: ext13; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib32; ValueData: hardware; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib33; ValueData: ggee; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueData: iem_anything; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: flib; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib36; ValueData: ekext; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib37; ValueData: flatspace; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib38; ValueData: deprecated; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: 38; Tasks: libs; Flags: uninsdeletekey +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 +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib41; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib42; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib43; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib44; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib45; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib46; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib47; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib48; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib49; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib50; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib51; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib52; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib53; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib54; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib55; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib56; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib57; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib58; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib59; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib60; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib61; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib62; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib63; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib64; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib65; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib66; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib67; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib68; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib69; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib70; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib71; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib72; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib73; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib74; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib75; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib76; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib77; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib78; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib79; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib80; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib81; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib82; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib83; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib84; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib85; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib86; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib87; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib88; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib89; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib90; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib91; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib92; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib93; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib94; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib95; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib96; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib97; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib98; Flags: deletevalue; Tasks: libs +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: expandsz; ValueName: path1; ValueData: %USERPROFILE%/Application Data/Pd; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path2; ValueData: %ProgramFiles%/Common Files/Pd; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path3; ValueData: %SystemRoot%/Fonts; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: 3; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path4; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path5; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path6; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path7; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path8; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path9; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path10; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path11; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path12; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path13; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path14; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path15; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path16; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path17; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path18; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path19; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path20; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path21; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path22; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path23; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path24; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path25; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path26; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path27; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path28; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path29; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path30; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path31; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path32; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path33; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path34; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path35; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path36; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path37; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path38; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path39; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path40; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path41; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path42; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path43; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path44; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path45; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path46; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path47; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path48; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path49; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path50; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path51; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path52; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path53; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path54; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path55; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path56; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path57; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path58; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path59; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path60; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path61; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path62; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path63; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path64; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path65; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path66; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path67; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path68; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path69; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path70; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path71; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path72; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path73; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path74; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path75; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path76; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path77; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path78; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path79; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path80; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path81; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path82; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path83; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path84; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path85; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path86; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path87; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path88; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path89; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path90; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path91; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path92; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path93; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path94; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path95; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path96; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path97; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path98; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path99; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path100; Flags: deletevalue; Tasks: libs + [_ISTool] Use7zip=true OutputExeFilename=Output\PACKAGE_NAME.exe

Modified: branches/pd-extended/v0-40/packages/win32_inno/pd-settings.reg =================================================================== --- branches/pd-extended/v0-40/packages/win32_inno/pd-settings.reg 2008-05-18 11:28:59 UTC (rev 9843) +++ branches/pd-extended/v0-40/packages/win32_inno/pd-settings.reg 2008-05-18 12:42:25 UTC (rev 9844) @@ -1,6 +1,7 @@ Windows Registry Editor Version 5.00

[HKEY_LOCAL_MACHINE\SOFTWARE\Pd] +"flags"="-helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd" "loadlib1"="libdir" "loadlib2"="hexloader" "loadlib3"="Gem" @@ -103,7 +104,7 @@ "loadlib98"=- "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 +"path1"=hex(2):25,00,50,00,72,00,6f,00,67,00,72,00,61,00,6d,00,46,00,69,00,6c,00,65,00,73,00,25,00,2f,00,43,00,6f,00,6d,00,6d,00,6f,00,6e,00,20,00,46,00,69,00,6c,00,65,00,73,00,2f,00,50,00,64,00,00,00 "path2"=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,2f,00,41,00,70,00,70,00,6c,00,69,00,63,00,61,00,74,00,69,00,6f,00,6e,00,20,00,44,00,61,00,74,00,61,00,2f,00,50,00,64,00,00,00 "path3"=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"=3 @@ -205,3 +206,4 @@ "path98"=- "path99"=- "path100"=- +; delete all existing path flags

Modified: branches/pd-extended/v0-40/scripts/generate-pd-settings-files.sh =================================================================== --- branches/pd-extended/v0-40/scripts/generate-pd-settings-files.sh 2008-05-18 11:28:59 UTC (rev 9843) +++ branches/pd-extended/v0-40/scripts/generate-pd-settings-files.sh 2008-05-18 12:42:25 UTC (rev 9844) @@ -4,11 +4,15 @@

GNULINUX_FONTPATH="~/pd /usr/share/pd /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" MACOSX_FONTPATH="~/Library/Pd /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" -# these are set as hex(2) since the .reg format doesn't support REG_EXPAND_SZ +# these are set as hex(2) since the .reg format doesn't support REG_EXPAND_SZ. +# Inno Setup doesn't convert REG_SZ hex values to REG_EXPAND_SZ, so Pd can't +# read the values then. Therefore there is a separate set for InnoSetup to +# use to create REG_EXPAND_SZ VALUES # path1 = %USERPROFILE%/Application Data/Pd # path2 = %ProgramFiles%/Common Files/Pd # path3 = %SystemRoot%/Fonts -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 hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,2f,00,41,00,70,00,70,00,6c,00,69,00,63,00,61,00,74,00,69,00,6f,00,6e,00,20,00,44,00,61,00,74,00,61,00,2f,00,50,00,64,00,00,00 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 " +WINDOWS_INNO_PATH="%USERPROFILE%/Application Data/Pd;%ProgramFiles%/Common Files/Pd;%SystemRoot%/Fonts" +WINDOWS_REG_PATH="hex(2):25,00,50,00,72,00,6f,00,67,00,72,00,61,00,6d,00,46,00,69,00,6c,00,65,00,73,00,25,00,2f,00,43,00,6f,00,6d,00,6d,00,6f,00,6e,00,20,00,46,00,69,00,6c,00,65,00,73,00,2f,00,50,00,64,00,00,00 hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,2f,00,41,00,70,00,70,00,6c,00,69,00,63,00,61,00,74,00,69,00,6f,00,6e,00,20,00,44,00,61,00,74,00,61,00,2f,00,50,00,64,00,00,00 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"

SCRIPT_DIR=`echo $0 | sed 's|(.*)/.*$|\1|'` ROOT_DIR=${SCRIPT_DIR}/../packages @@ -18,10 +22,10 @@ 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' +GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags: -helppath ~/pd -helppath /usr/share/pd'

-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>0</string>\n\t<key>flags</key>\n\t<string>-helppath /Library/Pd</string>' +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>0</string>\n\t<key>flags</key>\n\t<string>-helppath ~/Library/Pd -helppath /Library/Pd</string>' MACOSX_FOOTER='</dict>\n </plist>\n'

@@ -33,12 +37,6 @@ 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 -------------------------------------------------------------------# print_gnulinux () { @@ -48,6 +46,7 @@ print_gnulinux_fontpath () { i=0 + IFS=' ' for fontpath in $GNULINUX_FONTPATH; do ((++i)) echo "path${i}: ${fontpath}" >> $GNULINUX_FILE @@ -70,6 +69,7 @@ print_macosx_fontpath () { i=0 + IFS=' ' for fontpath in $MACOSX_FONTPATH; do ((++i)) echo -e "\t<key>path${i}</key>" >> $MACOSX_FILE @@ -94,28 +94,50 @@

print_windows_delete () { - echo ""${1}${2}"=-" >> $WINDOWS_FILE - echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs" >> $WINDOWS_INNO_FILE + echo ""${1}${2}"=-" >> $WINDOWS_FILE + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs" >> $WINDOWS_INNO_FILE }

-print_windows_fontpath () +print_windows_helppath () { - j=0 - for fontpath in $WINDOWS_FONTPATH; do - ((++j)) - 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 + echo ""flags"="-helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd"" >> $WINDOWS_FILE + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: flags; ValueData: -helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE +} + +print_windows_inno_path () +{ + j=0 + IFS=';' + for fontpath in $WINDOWS_INNO_PATH; do + ((++j)) + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path${j}; ValueData: ${fontpath}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE + done + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: ${j}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE # print lines to delete existing path flags - echo "; delete all existing path flags" >> $WINDOWS_FILE - while [ $j -lt 100 ]; do - ((++j)) - print_windows_delete path $j - done + echo "; delete all existing path flags" >> $WINDOWS_FILE + while [ $j -lt 100 ]; do + ((++j)) + echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path${j}; Flags: deletevalue; Tasks: libs" >> $WINDOWS_INNO_FILE + done }

+print_windows_reg_path () +{ + j=0 + IFS=' ' + for fontpath in $WINDOWS_REG_PATH; do + ((++j)) + echo ""path${j}"=${fontpath}" >> $WINDOWS_FILE + done + echo ""npath"=${j}" >> $WINDOWS_FILE +# print lines to delete existing path flags + echo "; delete all existing path flags" >> $WINDOWS_FILE + while [ $j -lt 100 ]; do + ((++j)) + echo ""path${j}"=-" >> $WINDOWS_FILE + done +} + print_windows_nloadlib () { echo ""nloadlib"=${1}" >> $WINDOWS_FILE @@ -124,7 +146,10 @@ #==============================================================================#

echo "Running for GNU/Linux and Darwin:" +echo -e $GNULINUX_HEADER > $GNULINUX_FILE +echo -e $MACOSX_HEADER > $MACOSX_FILE i=0 +IFS=' ' for lib in $LIBS; do ((++i)) echo -n "$lib " @@ -138,7 +163,14 @@

# run separately so some libs can be excluded on Windows echo "Running for Windows:" + +echo -e $WINDOWS_HEADER > $WINDOWS_FILE +echo -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_FILE + +print_windows_helppath + i=0 +IFS=' ' for lib in $LIBS; do case "$lib" in pdp) echo -n "(ignoring $lib on Windows) " ;; @@ -160,7 +192,8 @@ print_windows_delete loadlib $i done

-print_windows_fontpath +print_windows_reg_path +print_windows_inno_path

# the .pd-settings file needs an end tag for the path statements print_gnulinux_fontpath

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