updated libraries to load by default and added pd-extended.bat for MS Windows

svn path=/trunk/; revision=14591

7 files changed, 112 insertions, 127 deletions

diff --git a/packages/darwin_app/org.puredata.pdextended.default.plist b/packages/darwin_app/org.puredata.pdextended.default.plist
index e8fcaa19..78865d2d 100644
--- a/packages/darwin_app/org.puredata.pdextended.default.plist
+++ b/packages/darwin_app/org.puredata.pdextended.default.plist
@@ -9,27 +9,27 @@
 	<key>loadlib1</key>
 	<string>libdir</string>
 	<key>loadlib2</key>
-	<string>Gem</string>
+	<string>vanilla</string>
 	<key>loadlib3</key>
-	<string>cyclone</string>
+	<string>Gem</string>
 	<key>loadlib4</key>
-	<string>zexy</string>
+	<string>cyclone</string>
 	<key>loadlib5</key>
-	<string>creb</string>
+	<string>zexy</string>
 	<key>loadlib6</key>
-	<string>cxc</string>
+	<string>creb</string>
 	<key>loadlib7</key>
-	<string>iemlib</string>
+	<string>cxc</string>
 	<key>loadlib8</key>
-	<string>list-abs</string>
+	<string>iemlib</string>
 	<key>loadlib9</key>
-	<string>mapping</string>
+	<string>list-abs</string>
 	<key>loadlib10</key>
-	<string>markex</string>
+	<string>mapping</string>
 	<key>loadlib11</key>
-	<string>maxlib</string>
+	<string>markex</string>
 	<key>loadlib12</key>
-	<string>memento</string>
+	<string>maxlib</string>
 	<key>loadlib13</key>
 	<string>mjlib</string>
 	<key>loadlib14</key>
@@ -41,45 +41,31 @@
 	<key>loadlib17</key>
 	<string>pdogg</string>
 	<key>loadlib18</key>
-	<string>pixeltango</string>
-	<key>loadlib19</key>
 	<string>pmpd</string>
-	<key>loadlib20</key>
-	<string>rradical</string>
-	<key>loadlib21</key>
+	<key>loadlib19</key>
 	<string>sigpack</string>
-	<key>loadlib22</key>
+	<key>loadlib20</key>
 	<string>smlib</string>
-	<key>loadlib23</key>
-	<string>toxy</string>
-	<key>loadlib24</key>
+	<key>loadlib21</key>
 	<string>unauthorized</string>
-	<key>loadlib25</key>
-	<string>vbap</string>
-	<key>loadlib26</key>
+	<key>loadlib22</key>
 	<string>pan</string>
-	<key>loadlib27</key>
+	<key>loadlib23</key>
 	<string>hcs</string>
-	<key>loadlib28</key>
+	<key>loadlib24</key>
 	<string>jmmmp</string>
-	<key>loadlib29</key>
+	<key>loadlib25</key>
 	<string>ext13</string>
-	<key>loadlib30</key>
+	<key>loadlib26</key>
 	<string>ggee</string>
-	<key>loadlib31</key>
+	<key>loadlib27</key>
 	<string>iem_anything</string>
-	<key>loadlib32</key>
-	<string>flib</string>
-	<key>loadlib33</key>
+	<key>loadlib28</key>
 	<string>ekext</string>
-	<key>loadlib34</key>
-	<string>flatspace</string>
-	<key>loadlib35</key>
+	<key>loadlib29</key>
 	<string>pdp</string>
-	<key>loadlib36</key>
-	<string>pidip</string>
 	<key>nloadlib</key>
-	<string>36</string>
+	<string>29</string>
 	<key>path1</key>
 	<string>/System/Library/Fonts</string>
 	<key>path2</key>
diff --git a/packages/linux_make/default.pdextended b/packages/linux_make/default.pdextended
index 012c52ab..14be7c27 100644
--- a/packages/linux_make/default.pdextended
+++ b/packages/linux_make/default.pdextended
@@ -3,41 +3,34 @@ verbose: 0
 defeatrt: 0
 flags:
 loadlib1: libdir
-loadlib2: Gem
-loadlib3: cyclone
-loadlib4: zexy
-loadlib5: creb
-loadlib6: cxc
-loadlib7: iemlib
-loadlib8: list-abs
-loadlib9: mapping
-loadlib10: markex
-loadlib11: maxlib
-loadlib12: memento
+loadlib2: vanilla
+loadlib3: Gem
+loadlib4: cyclone
+loadlib5: zexy
+loadlib6: creb
+loadlib7: cxc
+loadlib8: iemlib
+loadlib9: list-abs
+loadlib10: mapping
+loadlib11: markex
+loadlib12: maxlib
 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: hcs
-loadlib28: jmmmp
-loadlib29: ext13
-loadlib30: ggee
-loadlib31: iem_anything
-loadlib32: flib
-loadlib33: ekext
-loadlib34: flatspace
-loadlib35: pdp
-loadlib36: pidip
-nloadlib: 36
+loadlib18: pmpd
+loadlib19: sigpack
+loadlib20: smlib
+loadlib21: unauthorized
+loadlib22: pan
+loadlib23: hcs
+loadlib24: jmmmp
+loadlib25: ext13
+loadlib26: ggee
+loadlib27: iem_anything
+loadlib28: ekext
+loadlib29: pdp
+nloadlib: 29
 path1: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
 npath: 1
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index e3035ed5..1c7535fb 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -55,6 +55,7 @@ prebuilt_install:
 	$(MAKE) -C $(packages_src) $(DEST_PATHS) extended_install
 	$(MAKE) -C $(packages_src) $(DEST_PATHS) doc_format
 	install -p pd-settings.reg $(DESTDIR)$(prefix)
+	install -p pd-extended.bat $(DESTDIR)$(prefix)
 
 #==============================================================================#
 #
diff --git a/packages/win32_inno/pd-extended.bat b/packages/win32_inno/pd-extended.bat
new file mode 100644
index 00000000..42deeabf
--- /dev/null
+++ b/packages/win32_inno/pd-extended.bat
@@ -0,0 +1 @@
+bin\pd.exe  -lib libdir -lib vanilla -lib Gem -lib cyclone -lib zexy -lib creb -lib cxc -lib iemlib -lib list-abs -lib mapping -lib markex -lib maxlib -lib mjlib -lib motex -lib oscx -lib pddp -lib pdogg -lib pmpd -lib sigpack -lib smlib -lib unauthorized -lib pan -lib hcs -lib jmmmp -lib ext13 -lib ggee -lib iem_anything -lib ekext
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 6de516ec..b9a828fb 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -81,40 +81,40 @@ Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData:
 
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: flags; ValueData: ; Tasks: libs; Flags: uninsdeletekey
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib2; ValueData: Gem; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib3; ValueData: cyclone; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib4; ValueData: zexy; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib5; ValueData: creb; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib6; ValueData: cxc; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib7; ValueData: iemlib; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib8; ValueData: list-abs; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib9; ValueData: mapping; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib10; ValueData: markex; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib11; ValueData: maxlib; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib12; ValueData: memento; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib2; ValueData: vanilla; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib3; ValueData: Gem; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib4; ValueData: cyclone; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib5; ValueData: zexy; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib6; ValueData: creb; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib7; ValueData: cxc; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib8; ValueData: iemlib; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib9; ValueData: list-abs; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib10; ValueData: mapping; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib11; ValueData: markex; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib12; ValueData: maxlib; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib13; ValueData: mjlib; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib14; ValueData: motex; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib15; ValueData: oscx; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib16; ValueData: pddp; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib17; ValueData: pdogg; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib18; ValueData: pixeltango; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib19; ValueData: pmpd; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib20; ValueData: rradical; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib21; ValueData: sigpack; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib22; ValueData: smlib; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib23; ValueData: toxy; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib24; ValueData: unauthorized; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib25; ValueData: vbap; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib26; ValueData: pan; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib27; ValueData: hcs; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib28; ValueData: jmmmp; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib29; ValueData: ext13; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib30; ValueData: ggee; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib31; ValueData: iem_anything; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib32; ValueData: flib; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib33; ValueData: ekext; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib34; ValueData: flatspace; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: nloadlib; ValueData: 34; Tasks: libs; Flags: uninsdeletekey
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib18; ValueData: pmpd; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib19; ValueData: sigpack; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib20; ValueData: smlib; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib21; ValueData: unauthorized; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib22; ValueData: pan; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib23; ValueData: hcs; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib24; ValueData: jmmmp; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib25; ValueData: ext13; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib26; ValueData: ggee; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib27; ValueData: iem_anything; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib28; ValueData: ekext; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: nloadlib; ValueData: 28; Tasks: libs; Flags: uninsdeletekey
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib29; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib30; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib31; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib32; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib33; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib34; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib35; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib36; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib37; Flags: deletevalue; Tasks: libs
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index faa24d78..1f5c03f4 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -3,41 +3,41 @@ Windows Registry Editor Version 5.00
 [HKEY_LOCAL_MACHINE\SOFTWARE\Pd-extended]
 "flags"=""
 "loadlib1"="libdir"
-"loadlib2"="Gem"
-"loadlib3"="cyclone"
-"loadlib4"="zexy"
-"loadlib5"="creb"
-"loadlib6"="cxc"
-"loadlib7"="iemlib"
-"loadlib8"="list-abs"
-"loadlib9"="mapping"
-"loadlib10"="markex"
-"loadlib11"="maxlib"
-"loadlib12"="memento"
+"loadlib2"="vanilla"
+"loadlib3"="Gem"
+"loadlib4"="cyclone"
+"loadlib5"="zexy"
+"loadlib6"="creb"
+"loadlib7"="cxc"
+"loadlib8"="iemlib"
+"loadlib9"="list-abs"
+"loadlib10"="mapping"
+"loadlib11"="markex"
+"loadlib12"="maxlib"
 "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"="hcs"
-"loadlib28"="jmmmp"
-"loadlib29"="ext13"
-"loadlib30"="ggee"
-"loadlib31"="iem_anything"
-"loadlib32"="flib"
-"loadlib33"="ekext"
-"loadlib34"="flatspace"
-"nloadlib"=34
+"loadlib18"="pmpd"
+"loadlib19"="sigpack"
+"loadlib20"="smlib"
+"loadlib21"="unauthorized"
+"loadlib22"="pan"
+"loadlib23"="hcs"
+"loadlib24"="jmmmp"
+"loadlib25"="ext13"
+"loadlib26"="ggee"
+"loadlib27"="iem_anything"
+"loadlib28"="ekext"
+"nloadlib"=28
 ; delete any previous loadlib flags
+"loadlib29"=-
+"loadlib30"=-
+"loadlib31"=-
+"loadlib32"=-
+"loadlib33"=-
+"loadlib34"=-
 "loadlib35"=-
 "loadlib36"=-
 "loadlib37"=-
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index f6e5a990..4ac018c5 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ECHO=/sw/bin/echo
-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 hcs jmmmp ext13 ggee iem_anything flib ekext flatspace pdp pidip"
+LIBS="libdir vanilla Gem cyclone zexy creb cxc iemlib list-abs mapping markex maxlib mjlib motex oscx pddp pdogg pmpd sigpack smlib unauthorized pan hcs jmmmp ext13 ggee iem_anything ekext pdp"
 
 GNULINUX_FONTPATH="/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
 MACOSX_FONTPATH="/System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/lib/fonts"
@@ -18,6 +18,7 @@ ROOT_DIR=${SCRIPT_DIR}/../packages
 
 GNULINUX_FILE=${ROOT_DIR}/linux_make/default.pdextended
 MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pdextended.default.plist
+WINDOWS_BATCH=${ROOT_DIR}/win32_inno/pd-extended.bat
 WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
 WINDOWS_INNO_FILE=${ROOT_DIR}/win32_inno/pd-inno.iss.in
 WINDOWS_INNO_REG_FILE=${ROOT_DIR}/win32_inno/pd-inno.registry.reg
@@ -90,6 +91,7 @@ print_windows ()
 {
 	 ${ECHO} "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
 	 ${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib$1; ValueData: $2; Tasks: libs"  >> $WINDOWS_INNO_REG_FILE
+         ${ECHO} -n " -lib $2" >> $WINDOWS_BATCH
 }
 
 print_windows_delete ()
@@ -164,6 +166,7 @@ print_macosx_nloadlib $i
 # run separately so some libs can be excluded on Windows
 ${ECHO} "Running for Windows:"
 
+${ECHO} -n "bin\\pd.exe " > $WINDOWS_BATCH
 ${ECHO} -e $WINDOWS_HEADER > $WINDOWS_FILE
 ${ECHO} -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_REG_FILE
 
@@ -194,6 +197,7 @@ done
 
 print_windows_reg_path
 print_windows_inno_path
+${ECHO} "" >> $WINDOWS_BATCH
 #
 TMPFILE=$WINDOWS_INNO_FILE.`date +%s`
 head -`grep -n "STARTHERE" $WINDOWS_INNO_FILE | cut -d ':' -f 1` $WINDOWS_INNO_FILE > $TMPFILE