Add some Apps and change tree version to the bare one.

svn path=/trunk/; revision=20540

diff --git a/rosapps/packmgr/cmd-line/main.c b/rosapps/packmgr/cmd-line/main.c
index 946046c..b9e37d7 100644 (file)
--- a/rosapps/packmgr/cmd-line/main.c
+++ b/rosapps/packmgr/cmd-line/main.c
@@ -185,7 +185,7 @@ int Show (void)
        WCHAR errbuf[2000];
 
        // load the tree
-       error = PML_LoadTree (&tree, "tree.xml", NULL);
+       error = PML_LoadTree (&tree, "tree_bare.xml", NULL);
        if(error)
        {
                wprintf(PML_TransError(error, errbuf, sizeof(errbuf)/sizeof(WCHAR)));

diff --git a/rosapps/packmgr/gui/main.c b/rosapps/packmgr/gui/main.c
index d0332b1..3878edc 100644 (file)
--- a/rosapps/packmgr/gui/main.c
+++ b/rosapps/packmgr/gui/main.c
@@ -75,7 +75,7 @@ int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, in
        UpdateWindow(hwnd);
 
        // Load the tree
-       int error = PML_LoadTree(&tree, "tree.xml", AddItem);
+       int error = PML_LoadTree(&tree, "tree_bare.xml", AddItem);
        
        if(error)
        {

diff --git a/rosapps/packmgr/tree/7zip.inst.rps b/rosapps/packmgr/tree/7zip.inst.rps
new file mode 100644 (file)
index 0000000..ab6cb13
--- /dev/null
+++ b/rosapps/packmgr/tree/7zip.inst.rps
@@ -0,0 +1,9 @@
+Sub Main\r
+  ' ToDo: Choose from different mirrors\r
+  download "http://prdownloads.sourceforge.net/sevenzip/7z432.exe?use_mirror=ovh", "7z432.exe"\r
+End Sub\r
+\r
+Sub After\r
+  shell 7z432.exe\r
+  ' ToDo: Delete 7z432.exe\r
+End Sub
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/7zip.xml b/rosapps/packmgr/tree/7zip.xml
new file mode 100644 (file)
index 0000000..8788212
--- /dev/null
+++ b/rosapps/packmgr/tree/7zip.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>7Zip</name>\r
+  <version>4.32</version>\r
+  <description>Utility to create and open zip, tar, rar and other archive files.</description>\r
+  <scripts inst="7zip.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/abiword.inst.rps b/rosapps/packmgr/tree/abiword.inst.rps
index 40cd3b9..7ec0460 100644 (file)
--- a/rosapps/packmgr/tree/abiword.inst.rps
+++ b/rosapps/packmgr/tree/abiword.inst.rps
@@ -1,9 +1,8 @@
-'Install rutine for abiword\r
-\r
 Sub Main     \r
-  download ("http://www.abisource.com/downloads/abiword/2.2.5/Windows/abiword-setup-2.2.5.exe", "abisetup.exe")\r
+  download "http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.exe", "abisetup.exe"\r
 End Sub\r
 \r
 Sub After\r
   shell abisetup.exe\r
+  ' ToDo: Delete abisetup.exe\r
 End Sub
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/abiword.xml b/rosapps/packmgr/tree/abiword.xml
index 40acfc3..ae8af57 100644 (file)
--- a/rosapps/packmgr/tree/abiword.xml
+++ b/rosapps/packmgr/tree/abiword.xml
@@ -1,7 +1,7 @@
 <package>
-<name>AbiWord</name>
-<description>Currently it's definitely the best word processor running under ReactOS.</description>
-<scripts inst="abiword.inst.rps" srcinst="abiword.inst.rps"/>
- 
+  <name>AbiWord</name>
+  <version>2.4.1</version>
+  <description>Word processor.</description>
+  <scripts inst="abiword.inst.rps"/>
 </package>
 

diff --git a/rosapps/packmgr/tree/firefox.inst.rps b/rosapps/packmgr/tree/firefox.inst.rps
new file mode 100644 (file)
index 0000000..0f77251
--- /dev/null
+++ b/rosapps/packmgr/tree/firefox.inst.rps
@@ -0,0 +1,9 @@
+Sub Main\r
+  ' ToDo: Choose from different mirrors\r
+  download ("http://download.mozilla.org/?lang=de&product=firefox-1.5&os=win", "firefoxinstaller.exe")\r
+End Sub\r
+\r
+Sub After\r
+  shell "firefoxinstaller.exe"\r
+  ' ToDo: Delete firefoxinstaller.exe\r
+End Sub
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/firefox.xml b/rosapps/packmgr/tree/firefox.xml
new file mode 100644 (file)
index 0000000..4ee7c4c
--- /dev/null
+++ b/rosapps/packmgr/tree/firefox.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>Firefox</name>\r
+  <version>1.5</version>\r
+  <description>The famous OpenSource webbroswer.</description>\r
+  <scripts inst="firefox.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/irfanview.inst.rps b/rosapps/packmgr/tree/irfanview.inst.rps
new file mode 100644 (file)
index 0000000..e403569
--- /dev/null
+++ b/rosapps/packmgr/tree/irfanview.inst.rps
@@ -0,0 +1,8 @@
+Sub Main\r
+  ' ToDo: Choose from different mirrors\r
+  download ("http://www.aeicomputertech.com/_downloads/iview398.exe", "iview398.exe")\r
+End Sub\r
+\r
+Sub After\r
+  shell iview398.exe\r
+End Sub
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/irfanview.xml b/rosapps/packmgr/tree/irfanview.xml
new file mode 100644 (file)
index 0000000..7d51ac2
--- /dev/null
+++ b/rosapps/packmgr/tree/irfanview.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>IrfanView</name>\r
+  <version>3.98</version>\r
+  <description>Viewer for all kinds of graphics.</description>\r
+  <scripts inst="irfanview.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/mozcontrol.xml b/rosapps/packmgr/tree/mozcontrol.xml
index 7c5981a..8a18751 100644 (file)
--- a/rosapps/packmgr/tree/mozcontrol.xml
+++ b/rosapps/packmgr/tree/mozcontrol.xml
@@ -1,6 +1,11 @@
+<!--
+Not in use since reactos can download it itself now.
+-->
+
 <package>
-  <name>MozillaControl</name>
-  <description>Provide the Gekko Engine for ReactOS.</description>
-  <scripts inst="mozillacontrol.inst.rps" srcinst="mozillacontrol.inst.rps"/>
+  <name>Mozilla Control</name>
+  <version>1.6</version>
+  <description>Provides the Gekko Engine for ReactOS.</description>
+  <scripts inst="mozillacontrol.inst.rps"/>
 </package>
 

diff --git a/rosapps/packmgr/tree/mozillacontrol.inst.rps b/rosapps/packmgr/tree/mozillacontrol.inst.rps
index 096e2a4..f58f74c 100644 (file)
--- a/rosapps/packmgr/tree/mozillacontrol.inst.rps
+++ b/rosapps/packmgr/tree/mozillacontrol.inst.rps
@@ -1,5 +1,4 @@
-'Install rutine for Mozilla Control 1.6\r
-\r
+' Not in use anymore because reactos can download it without Package Manager\r
 Sub Main\r
   download ("http://www.iol.ie/~locka/mozilla/MozillaControl16.exe", "mozillacontrol16.exe")\r
 End Sub\r

diff --git a/rosapps/packmgr/tree/mplayer.inst.rps b/rosapps/packmgr/tree/mplayer.inst.rps
new file mode 100644 (file)
index 0000000..cde73bc
--- /dev/null
+++ b/rosapps/packmgr/tree/mplayer.inst.rps
@@ -0,0 +1,2 @@
+' ToDo: Find the best from all the installers and frontends\r
+' or add zip support for http://www1.mplayerhq.hu/MPlayer/releases/win32/old/MPlayer-mingw32-1.0pre7.zip
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/mplayer.xml b/rosapps/packmgr/tree/mplayer.xml
new file mode 100644 (file)
index 0000000..9603e4d
--- /dev/null
+++ b/rosapps/packmgr/tree/mplayer.xml
@@ -0,0 +1,13 @@
+<!--\r
+ToDo: \r
+Chhose the right one from all the installer and GUI fronend packages\r
+or add zip support for the official distro\r
+-->\r
+\r
+<package>\r
+  <name>mPlayer</name>\r
+  <version>1.0 pre7</version>\r
+  <description>Commandline Media Player which works under ReactOs.</description>\r
+  <scripts inst="mplayer.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/openoffice.inst.rps b/rosapps/packmgr/tree/openoffice.inst.rps
new file mode 100644 (file)
index 0000000..7f60738
--- /dev/null
+++ b/rosapps/packmgr/tree/openoffice.inst.rps
@@ -0,0 +1 @@
+' ToDo: Implment Zip unpacking
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/openoffice.xml b/rosapps/packmgr/tree/openoffice.xml
new file mode 100644 (file)
index 0000000..3e43b67
--- /dev/null
+++ b/rosapps/packmgr/tree/openoffice.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>OpenOffice 1</name>\r
+  <version>1.1.5</version>\r
+  <description>OpenSource replacement for Microsoft Office.</description>\r
+  <scripts inst="openoffice.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/putty.inst.rps b/rosapps/packmgr/tree/putty.inst.rps
new file mode 100644 (file)
index 0000000..59dff6c
--- /dev/null
+++ b/rosapps/packmgr/tree/putty.inst.rps
@@ -0,0 +1,4 @@
+Sub Main\r
+  ' ToDo: Download putty.exe to programm files\r
+  download ("http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe", "putty.exe")\r
+End Sub
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/putty.xml b/rosapps/packmgr/tree/putty.xml
new file mode 100644 (file)
index 0000000..147faa5
--- /dev/null
+++ b/rosapps/packmgr/tree/putty.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>Putty</name>\r
+  <version>beta 0.58</version>\r
+  <description>SSH and Telnet client.</description>\r
+  <scripts inst="putty.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/rosbe.inst.rps b/rosapps/packmgr/tree/rosbe.inst.rps
new file mode 100644 (file)
index 0000000..1071b97
--- /dev/null
+++ b/rosapps/packmgr/tree/rosbe.inst.rps
@@ -0,0 +1,8 @@
+Sub Main\r
+  download ("http://blight.reactos.at/reactos-be/ReactOS%20Build%20Environment%200.1-3.4.2.exe", "rosbe01.exe")\r
+End Sub\r
+\r
+Sub After\r
+  shell rosbe01.exe\r
+  ' ToDo: Delete rosbe01.exe\r
+End Sub
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/rosbe.xml b/rosapps/packmgr/tree/rosbe.xml
new file mode 100644 (file)
index 0000000..cc64b25
--- /dev/null
+++ b/rosapps/packmgr/tree/rosbe.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>Build Envirement</name>\r
+  <version>0.1</version>\r
+  <description>Allows you to build the ReactOS Source. For more instructions see our wiki.</description>\r
+  <scripts inst="rosbe.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/tiny.inst.rps b/rosapps/packmgr/tree/tiny.inst.rps
new file mode 100644 (file)
index 0000000..0c78fe3
--- /dev/null
+++ b/rosapps/packmgr/tree/tiny.inst.rps
@@ -0,0 +1,2 @@
+' ToDo: Implement Unzipping\r
+' http://www.ritlabs.com/download/tinyweb/tinyweb.zip
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/tiny.xml b/rosapps/packmgr/tree/tiny.xml
new file mode 100644 (file)
index 0000000..7a6d613
--- /dev/null
+++ b/rosapps/packmgr/tree/tiny.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>Ritlab Tiny Webserver</name>\r
+  <version>1.93</version>\r
+  <description>This is a simple webserver running under ReactOs.</description>\r
+  <scripts inst="tiny.inst.rps"/>\r
+</package>\r
+\r

diff --git a/rosapps/packmgr/tree/tree.xml b/rosapps/packmgr/tree/tree.xml
index 9cd07ca..245e0a9 100644 (file)
--- a/rosapps/packmgr/tree/tree.xml
+++ b/rosapps/packmgr/tree/tree.xml
@@ -1,15 +1,28 @@
 <tree>
   <node name="Internet and Network" icon="5">
-    <node name="Mozilla Control" file="mozcontrol.xml"/>
+       <node name="Firefox" file="firebox.xml"/>
+    <!--<node name="Mozilla Control" file="mozcontrol.xml"/>-->
+       <node name="Putty" file="putty.xml"/>
+       <node name="Tiny Webserver" file="tiny.xml"/>
   </node>
   <node name="Office" icon="6">
     <node name="AbiWord" file="abiword.xml"/>
+       <!--<node name="OpenOffice 1" file="openoffice.xml"/>--> <!-- Needs Zip support -->
+  </node>
+  <node name="Graphics" icon="7">
+       <node name="IrfanView" file="irfanview.xml"/>
+       <node name="TuxPaint" file="tuxpaint.xml"/>
+  </node>
+  <node name="Multimedia" icon="8">
+       <!--<node name="mPlayer" file="mplayer.xml"/>--> <!-- ToDo: Choose a good one from all the installers and frondends -->
+  <node>
+  <node name="Development" icon="9">
+       <node name="Build Envirment" file="rosbe.xml"/>
   </node>
-  <node name="Graphics" icon="7"/>
-  <node name="Multimedia" icon="8"/>
-  <node name="Development" icon="9"/>
   <node name="Games and Fun" icon="10"/>
-  <node name="Tools" icon="11"/>
+  <node name="Tools" icon="11">
+       <node name="7Zip" file="7zip.xml"/>
+  </node>
   <node name="Others" icon="12"/>
   <node name="Installed Programms" icon="13"/>
 </tree>
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/tree_bare.xml b/rosapps/packmgr/tree/tree_bare.xml
index 3e4cd5f..98331b7 100644 (file)
--- a/rosapps/packmgr/tree/tree_bare.xml
+++ b/rosapps/packmgr/tree/tree_bare.xml
@@ -1,4 +1,12 @@
 <tree>\r
-       <node name="Mozilla Control" file="mozcontrol.xml"/>\r
-       <node name="AbiWord" file="abiword.xml"/>\r
+       <node name="7Zip" file="7zip.xml"/>\r
+    <node name="AbiWord" file="abiword.xml"/>\r
+       <node name="Build Envirment" file="rosbe.xml"/>\r
+       <node name="Firefox" file="firebox.xml"/>\r
+       <node name="IrfanView" file="irfanview.xml"/>\r
+       <!--<node name="mPlayer" file="mplayer.xml"/>--> <!-- ToDo: Choose a good one from all the installers and frondends -->\r
+       <!--<node name="OpenOffice 1" file="openoffice.xml"/>--> <!-- Needs Zip support -->\r
+       <node name="Putty" file="putty.xml"/>\r
+       <node name="TuxPaint" file="tuxpaint.xml"/>\r
+       <node name="Tiny Webserver" file="tiny.xml"/>\r
 </tree>
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/tree_withsubs.xml b/rosapps/packmgr/tree/tree_withsubs.xml
index 71dfba5..e03124e 100644 (file)
--- a/rosapps/packmgr/tree/tree_withsubs.xml
+++ b/rosapps/packmgr/tree/tree_withsubs.xml
@@ -1,4 +1,5 @@
 <tree>
+  <node name="Warning: Not up to date"/>
   <node name="Internet and Network" icon="5">
     <node name="Browser" icon="5">
       <node name="MozillaControl" file="mozcontrol.xml"/>

diff --git a/rosapps/packmgr/tree/tuxpaint.inst.rps b/rosapps/packmgr/tree/tuxpaint.inst.rps
new file mode 100644 (file)
index 0000000..3742d75
--- /dev/null
+++ b/rosapps/packmgr/tree/tuxpaint.inst.rps
@@ -0,0 +1,9 @@
+Sub Main\r
+  ' ToDo: Pick a mirror\r
+  download ("http://switch.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.15-2-win32-installer.exe", "tuxpaint-inst.exe")\r
+End Sub\r
+\r
+Sub After\r
+  shell tuxpaint-inst.exe\r
+  ' ToDo: delete tuxpaint-inst.exe\r
+End Sub
\ No newline at end of file

diff --git a/rosapps/packmgr/tree/tuxpaint.xml b/rosapps/packmgr/tree/tuxpaint.xml
new file mode 100644 (file)
index 0000000..a2e65ad
--- /dev/null
+++ b/rosapps/packmgr/tree/tuxpaint.xml
@@ -0,0 +1,7 @@
+<package>\r
+  <name>TuxPaint</name>\r
+  <version>0.9.15-2</version>\r
+  <description>An open source bitmap graphics editor geared towards young children.</description>\r
+  <scripts inst="tuxpaint.inst.rps"/>\r
+</package>\r
+\r