[PD-cvs] SF.net SVN: pure-data: [10142] branches/pd-extended/v0-40
eighthave at users.sourceforge.net
eighthave at users.sourceforge.net
Sat Jul 5 20:33:56 CEST 2008
Revision: 10142
http://pure-data.svn.sourceforge.net/pure-data/?rev=10142&view=rev
Author: eighthave
Date: 2008-07-05 11:33:56 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
- removed hexloader as a default startup library
- fixed script so that it automatically generates the complete Windows
pd-inno.iss.in file
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-07-04 03:54:32 UTC (rev 10141)
+++ branches/pd-extended/v0-40/packages/darwin_app/org.puredata.pd.default.plist 2008-07-05 18:33:56 UTC (rev 10142)
@@ -9,81 +9,79 @@
<key>loadlib1</key>
<string>libdir</string>
<key>loadlib2</key>
- <string>hexloader</string>
- <key>loadlib3</key>
<string>Gem</string>
- <key>loadlib4</key>
+ <key>loadlib3</key>
<string>cyclone</string>
- <key>loadlib5</key>
+ <key>loadlib4</key>
<string>zexy</string>
- <key>loadlib6</key>
+ <key>loadlib5</key>
<string>creb</string>
- <key>loadlib7</key>
+ <key>loadlib6</key>
<string>cxc</string>
- <key>loadlib8</key>
+ <key>loadlib7</key>
<string>iemlib</string>
- <key>loadlib9</key>
+ <key>loadlib8</key>
<string>list-abs</string>
- <key>loadlib10</key>
+ <key>loadlib9</key>
<string>mapping</string>
- <key>loadlib11</key>
+ <key>loadlib10</key>
<string>markex</string>
- <key>loadlib12</key>
+ <key>loadlib11</key>
<string>maxlib</string>
- <key>loadlib13</key>
+ <key>loadlib12</key>
<string>memento</string>
- <key>loadlib14</key>
+ <key>loadlib13</key>
<string>mjlib</string>
- <key>loadlib15</key>
+ <key>loadlib14</key>
<string>motex</string>
- <key>loadlib16</key>
+ <key>loadlib15</key>
<string>oscx</string>
- <key>loadlib17</key>
+ <key>loadlib16</key>
<string>pddp</string>
- <key>loadlib18</key>
+ <key>loadlib17</key>
<string>pdogg</string>
- <key>loadlib19</key>
+ <key>loadlib18</key>
<string>pixeltango</string>
- <key>loadlib20</key>
+ <key>loadlib19</key>
<string>pmpd</string>
- <key>loadlib21</key>
+ <key>loadlib20</key>
<string>rradical</string>
- <key>loadlib22</key>
+ <key>loadlib21</key>
<string>sigpack</string>
- <key>loadlib23</key>
+ <key>loadlib22</key>
<string>smlib</string>
- <key>loadlib24</key>
+ <key>loadlib23</key>
<string>toxy</string>
- <key>loadlib25</key>
+ <key>loadlib24</key>
<string>unauthorized</string>
- <key>loadlib26</key>
+ <key>loadlib25</key>
<string>vbap</string>
- <key>loadlib27</key>
+ <key>loadlib26</key>
<string>pan</string>
- <key>loadlib28</key>
+ <key>loadlib27</key>
<string>freeverb</string>
- <key>loadlib29</key>
+ <key>loadlib28</key>
<string>hcs</string>
- <key>loadlib30</key>
+ <key>loadlib29</key>
<string>jmmmp</string>
- <key>loadlib31</key>
+ <key>loadlib30</key>
<string>ext13</string>
- <key>loadlib32</key>
+ <key>loadlib31</key>
<string>ggee</string>
- <key>loadlib33</key>
+ <key>loadlib32</key>
<string>iem_anything</string>
- <key>loadlib34</key>
+ <key>loadlib33</key>
<string>flib</string>
- <key>loadlib35</key>
+ <key>loadlib34</key>
<string>ekext</string>
- <key>loadlib36</key>
+ <key>loadlib35</key>
<string>flatspace</string>
- <key>loadlib37</key>
+ <key>loadlib36</key>
<string>pdp</string>
- <key>loadlib38</key>
+ <key>loadlib37</key>
<string>pidip</string>
<key>nloadlib</key>
- <string>38</string>
+ <string>37</string>
<key>path1</key>
<string>~/Library/Pd</string>
<key>path2</key>
Modified: branches/pd-extended/v0-40/packages/linux_make/default.pdsettings
===================================================================
--- branches/pd-extended/v0-40/packages/linux_make/default.pdsettings 2008-07-04 03:54:32 UTC (rev 10141)
+++ branches/pd-extended/v0-40/packages/linux_make/default.pdsettings 2008-07-05 18:33:56 UTC (rev 10142)
@@ -1,46 +1,45 @@
standardpath: 1
verbose: 0
defeatrt: 0
-flags: -helppath ~/pd-externals -helppath /usr/local/lib/pd-externals
+flags: -helppath ~/pd -helppath /usr/share/pd
loadlib1: libdir
-loadlib2: hexloader
-loadlib3: Gem
-loadlib4: cyclone
-loadlib5: zexy
-loadlib6: creb
-loadlib7: cxc
-loadlib8: iemlib
-loadlib9: list-abs
-loadlib10: mapping
-loadlib11: markex
-loadlib12: maxlib
-loadlib13: memento
-loadlib14: mjlib
-loadlib15: motex
-loadlib16: oscx
-loadlib17: pddp
-loadlib18: pdogg
-loadlib19: pixeltango
-loadlib20: pmpd
-loadlib21: rradical
-loadlib22: sigpack
-loadlib23: smlib
-loadlib24: toxy
-loadlib25: unauthorized
-loadlib26: vbap
-loadlib27: pan
-loadlib28: freeverb
-loadlib29: hcs
-loadlib30: jmmmp
-loadlib31: ext13
-loadlib32: ggee
-loadlib33: iem_anything
-loadlib34: flib
-loadlib35: ekext
-loadlib36: flatspace
-loadlib37: pdp
-loadlib38: pidip
-nloadlib: 38
+loadlib2: Gem
+loadlib3: cyclone
+loadlib4: zexy
+loadlib5: creb
+loadlib6: cxc
+loadlib7: iemlib
+loadlib8: list-abs
+loadlib9: mapping
+loadlib10: markex
+loadlib11: maxlib
+loadlib12: memento
+loadlib13: mjlib
+loadlib14: motex
+loadlib15: oscx
+loadlib16: pddp
+loadlib17: pdogg
+loadlib18: pixeltango
+loadlib19: pmpd
+loadlib20: rradical
+loadlib21: sigpack
+loadlib22: smlib
+loadlib23: toxy
+loadlib24: unauthorized
+loadlib25: vbap
+loadlib26: pan
+loadlib27: freeverb
+loadlib28: hcs
+loadlib29: jmmmp
+loadlib30: ext13
+loadlib31: ggee
+loadlib32: iem_anything
+loadlib33: flib
+loadlib34: ekext
+loadlib35: flatspace
+loadlib36: pdp
+loadlib37: pidip
+nloadlib: 37
path1: ~/pd-externals
path2: /usr/local/lib/pd-externals
path3: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
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-07-04 03:54:32 UTC (rev 10141)
+++ branches/pd-extended/v0-40/packages/win32_inno/pd-inno.iss.in 2008-07-05 18:33:56 UTC (rev 10142)
@@ -65,46 +65,46 @@
Root: HKCR; SubKey: .pd; ValueType: string; ValueData: Pure.Data; Flags: noerror uninsdeletekey; Tasks: fileassociations
Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: noerror uninsdeletekey; Tasks: fileassociations
;
-; add pd-inno_registry after this comment:
+; STARTHERE: 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
-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: ggee; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib33; ValueData: iem_anything; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueData: flib; Tasks: libs
-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: nloadlib; ValueData: 36; Tasks: libs; Flags: uninsdeletekey
+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
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib4; ValueData: zexy; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib5; ValueData: creb; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib6; ValueData: cxc; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib7; ValueData: iemlib; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib8; ValueData: list-abs; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib9; ValueData: mapping; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib10; ValueData: markex; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib11; ValueData: maxlib; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib12; ValueData: memento; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib13; ValueData: mjlib; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib14; ValueData: motex; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib15; ValueData: oscx; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib16; ValueData: pddp; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib17; ValueData: pdogg; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib18; ValueData: pixeltango; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib19; ValueData: pmpd; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib20; ValueData: rradical; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib21; ValueData: sigpack; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib22; ValueData: smlib; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib23; ValueData: toxy; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib24; ValueData: unauthorized; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib25; ValueData: vbap; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib26; ValueData: pan; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib27; ValueData: freeverb; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib28; ValueData: hcs; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib29; ValueData: jmmmp; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib30; ValueData: ext13; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib31; ValueData: ggee; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib32; ValueData: iem_anything; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib33; ValueData: flib; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueData: ekext; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: flatspace; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: 35; Tasks: libs; Flags: uninsdeletekey
+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib36; Flags: deletevalue; Tasks: libs
Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib37; Flags: deletevalue; Tasks: libs
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
Modified: branches/pd-extended/v0-40/packages/win32_inno/pd-settings.reg
===================================================================
--- branches/pd-extended/v0-40/packages/win32_inno/pd-settings.reg 2008-07-04 03:54:32 UTC (rev 10141)
+++ branches/pd-extended/v0-40/packages/win32_inno/pd-settings.reg 2008-07-05 18:33:56 UTC (rev 10142)
@@ -3,43 +3,43 @@
[HKEY_LOCAL_MACHINE\SOFTWARE\Pd]
"flags"="-helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd"
"loadlib1"="libdir"
-"loadlib2"="hexloader"
-"loadlib3"="Gem"
-"loadlib4"="cyclone"
-"loadlib5"="zexy"
-"loadlib6"="creb"
-"loadlib7"="cxc"
-"loadlib8"="iemlib"
-"loadlib9"="list-abs"
-"loadlib10"="mapping"
-"loadlib11"="markex"
-"loadlib12"="maxlib"
-"loadlib13"="memento"
-"loadlib14"="mjlib"
-"loadlib15"="motex"
-"loadlib16"="oscx"
-"loadlib17"="pddp"
-"loadlib18"="pdogg"
-"loadlib19"="pixeltango"
-"loadlib20"="pmpd"
-"loadlib21"="rradical"
-"loadlib22"="sigpack"
-"loadlib23"="smlib"
-"loadlib24"="toxy"
-"loadlib25"="unauthorized"
-"loadlib26"="vbap"
-"loadlib27"="pan"
-"loadlib28"="freeverb"
-"loadlib29"="hcs"
-"loadlib30"="jmmmp"
-"loadlib31"="ext13"
-"loadlib32"="ggee"
-"loadlib33"="iem_anything"
-"loadlib34"="flib"
-"loadlib35"="ekext"
-"loadlib36"="flatspace"
-"nloadlib"=36
+"loadlib2"="Gem"
+"loadlib3"="cyclone"
+"loadlib4"="zexy"
+"loadlib5"="creb"
+"loadlib6"="cxc"
+"loadlib7"="iemlib"
+"loadlib8"="list-abs"
+"loadlib9"="mapping"
+"loadlib10"="markex"
+"loadlib11"="maxlib"
+"loadlib12"="memento"
+"loadlib13"="mjlib"
+"loadlib14"="motex"
+"loadlib15"="oscx"
+"loadlib16"="pddp"
+"loadlib17"="pdogg"
+"loadlib18"="pixeltango"
+"loadlib19"="pmpd"
+"loadlib20"="rradical"
+"loadlib21"="sigpack"
+"loadlib22"="smlib"
+"loadlib23"="toxy"
+"loadlib24"="unauthorized"
+"loadlib25"="vbap"
+"loadlib26"="pan"
+"loadlib27"="freeverb"
+"loadlib28"="hcs"
+"loadlib29"="jmmmp"
+"loadlib30"="ext13"
+"loadlib31"="ggee"
+"loadlib32"="iem_anything"
+"loadlib33"="flib"
+"loadlib34"="ekext"
+"loadlib35"="flatspace"
+"nloadlib"=35
; delete any previous loadlib flags
+"loadlib36"=-
"loadlib37"=-
"loadlib38"=-
"loadlib39"=-
Modified: branches/pd-extended/v0-40/scripts/generate-pd-settings-files.sh
===================================================================
--- branches/pd-extended/v0-40/scripts/generate-pd-settings-files.sh 2008-07-04 03:54:32 UTC (rev 10141)
+++ branches/pd-extended/v0-40/scripts/generate-pd-settings-files.sh 2008-07-05 18:33:56 UTC (rev 10142)
@@ -1,6 +1,6 @@
#!/bin/sh
-LIBS="libdir hexloader Gem cyclone zexy creb cxc 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 ggee iem_anything flib ekext flatspace pdp pidip"
+LIBS="libdir Gem cyclone zexy creb cxc 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 ggee iem_anything flib ekext flatspace pdp pidip"
GNULINUX_FONTPATH="~/pd-externals /usr/local/lib/pd-externals /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"
@@ -20,7 +20,8 @@
GNULINUX_FILE=${ROOT_DIR}/linux_make/default.pdsettings
MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.default.plist
WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
-WINDOWS_INNO_FILE=${ROOT_DIR}/win32_inno/pd-inno.registry.reg
+WINDOWS_INNO_FILE=${ROOT_DIR}/win32_inno/pd-inno.iss.in
+WINDOWS_INNO_REG_FILE=${ROOT_DIR}/win32_inno/pd-inno.registry.reg
GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags: -helppath ~/pd -helppath /usr/share/pd'
@@ -89,19 +90,19 @@
print_windows ()
{
echo "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
- echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib$1; ValueData: $2; Tasks: libs" >> $WINDOWS_INNO_FILE
+ echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib$1; ValueData: $2; Tasks: libs" >> $WINDOWS_INNO_REG_FILE
}
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 "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs" >> $WINDOWS_INNO_REG_FILE
}
print_windows_helppath ()
{
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
+ 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_REG_FILE
}
print_windows_inno_path ()
@@ -110,14 +111,14 @@
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
+ echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path${j}; ValueData: ${fontpath}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
done
- echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: ${j}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_FILE
+ echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: ${j}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
# print lines to delete existing path flags
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
+ echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path${j}; Flags: deletevalue; Tasks: libs" >> $WINDOWS_INNO_REG_FILE
done
}
@@ -141,7 +142,7 @@
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 "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: ${1}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
}
#==============================================================================#
@@ -165,7 +166,7 @@
echo "Running for Windows:"
echo -e $WINDOWS_HEADER > $WINDOWS_FILE
-echo -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_FILE
+echo -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_REG_FILE
print_windows_helppath
@@ -194,6 +195,14 @@
print_windows_reg_path
print_windows_inno_path
+#
+TMPFILE=$WINDOWS_INNO_FILE.`date +%s`
+head -`grep -n "STARTHERE" $WINDOWS_INNO_FILE | cut -d ':' -f 1` $WINDOWS_INNO_FILE > $TMPFILE
+cat $WINDOWS_INNO_REG_FILE >> $TMPFILE
+FILE_LENGTH=`wc -l $WINDOWS_INNO_FILE | cut -d ' ' -f 1`
+END_LENGTH=`grep -n "ENDHERE" $WINDOWS_INNO_FILE | cut -d ':' -f 1`
+tail -`expr $FILE_LENGTH - $END_LENGTH` $WINDOWS_INNO_FILE >> $TMPFILE
+mv -f -- $TMPFILE $WINDOWS_INNO_FILE
# 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.
More information about the Pd-cvs
mailing list