[ros-diffs] [mbosma] 20540: Add some Apps and change tree version to the bare one.

Add some Apps and change tree version to the bare one.
Modified: trunk/rosapps/packmgr/cmd-line/main.c
Modified: trunk/rosapps/packmgr/gui/main.c
Added: trunk/rosapps/packmgr/tree/7zip.inst.rps
Added: trunk/rosapps/packmgr/tree/7zip.xml
Modified: trunk/rosapps/packmgr/tree/abiword.inst.rps
Modified: trunk/rosapps/packmgr/tree/abiword.xml
Added: trunk/rosapps/packmgr/tree/firefox.inst.rps
Added: trunk/rosapps/packmgr/tree/firefox.xml
Added: trunk/rosapps/packmgr/tree/irfanview.inst.rps
Added: trunk/rosapps/packmgr/tree/irfanview.xml
Modified: trunk/rosapps/packmgr/tree/mozcontrol.xml
Modified: trunk/rosapps/packmgr/tree/mozillacontrol.inst.rps
Added: trunk/rosapps/packmgr/tree/mplayer.inst.rps
Added: trunk/rosapps/packmgr/tree/mplayer.xml
Added: trunk/rosapps/packmgr/tree/openoffice.inst.rps
Added: trunk/rosapps/packmgr/tree/openoffice.xml
Added: trunk/rosapps/packmgr/tree/putty.inst.rps
Added: trunk/rosapps/packmgr/tree/putty.xml
Added: trunk/rosapps/packmgr/tree/rosbe.inst.rps
Added: trunk/rosapps/packmgr/tree/rosbe.xml
Added: trunk/rosapps/packmgr/tree/tiny.inst.rps
Added: trunk/rosapps/packmgr/tree/tiny.xml
Modified: trunk/rosapps/packmgr/tree/tree.xml
Modified: trunk/rosapps/packmgr/tree/tree_bare.xml
Modified: trunk/rosapps/packmgr/tree/tree_withsubs.xml
Added: trunk/rosapps/packmgr/tree/tuxpaint.inst.rps
Added: trunk/rosapps/packmgr/tree/tuxpaint.xml
  _____  

Modified: trunk/rosapps/packmgr/cmd-line/main.c
--- trunk/rosapps/packmgr/cmd-line/main.c	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/cmd-line/main.c	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -185,7 +185,7 @@

 	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)));
  _____  

Modified: trunk/rosapps/packmgr/gui/main.c
--- trunk/rosapps/packmgr/gui/main.c	2006-01-03 00:10:01 UTC (rev
20539)
+++ trunk/rosapps/packmgr/gui/main.c	2006-01-03 00:12:35 UTC (rev
20540)
@@ -75,7 +75,7 @@

 	UpdateWindow(hwnd);
 
 	// Load the tree
-	int error = PML_LoadTree(&tree, "tree.xml", AddItem);
+	int error = PML_LoadTree(&tree, "tree_bare.xml", AddItem);
 	
 	if(error)
 	{
  _____  

Added: trunk/rosapps/packmgr/tree/7zip.inst.rps
--- trunk/rosapps/packmgr/tree/7zip.inst.rps	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/7zip.inst.rps	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,9 @@

+Sub Main
+  ' ToDo: Choose from different mirrors
+  download
"http://prdownloads.sourceforge.net/sevenzip/7z432.exe?use_mirror=ovh",
"7z432.exe"
+End Sub
+
+Sub After
+  shell 7z432.exe
+  ' ToDo: Delete 7z432.exe
+End Sub
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/7zip.xml
--- trunk/rosapps/packmgr/tree/7zip.xml	2006-01-03 00:10:01 UTC (rev
20539)
+++ trunk/rosapps/packmgr/tree/7zip.xml	2006-01-03 00:12:35 UTC (rev
20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>7Zip</name>
+  <version>4.32</version>
+  <description>Utility to create and open zip, tar, rar and other
archive files.</description>
+  <scripts inst="7zip.inst.rps"/>
+</package>
+
  _____  

Modified: trunk/rosapps/packmgr/tree/abiword.inst.rps
--- trunk/rosapps/packmgr/tree/abiword.inst.rps	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/abiword.inst.rps	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -1,9 +1,8 @@

-'Install rutine for abiword
-
 Sub Main     
-  download
("http://www.abisource.com/downloads/abiword/2.2.5/Windows/abiword-setup
-2.2.5.exe", "abisetup.exe")
+  download
"http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.
4.1.exe", "abisetup.exe"
 End Sub
 
 Sub After
   shell abisetup.exe
+  ' ToDo: Delete abisetup.exe
 End Sub
\ No newline at end of file
  _____  

Modified: trunk/rosapps/packmgr/tree/abiword.xml
--- trunk/rosapps/packmgr/tree/abiword.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/abiword.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -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>
 
  _____  

Added: trunk/rosapps/packmgr/tree/firefox.inst.rps
--- trunk/rosapps/packmgr/tree/firefox.inst.rps	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/firefox.inst.rps	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,9 @@

+Sub Main
+  ' ToDo: Choose from different mirrors
+  download
("http://download.mozilla.org/?lang=de&product=firefox-1.5&os=win",
"firefoxinstaller.exe")
+End Sub
+
+Sub After
+  shell "firefoxinstaller.exe"
+  ' ToDo: Delete firefoxinstaller.exe
+End Sub
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/firefox.xml
--- trunk/rosapps/packmgr/tree/firefox.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/firefox.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>Firefox</name>
+  <version>1.5</version>
+  <description>The famous OpenSource webbroswer.</description>
+  <scripts inst="firefox.inst.rps"/>
+</package>
+
  _____  

Added: trunk/rosapps/packmgr/tree/irfanview.inst.rps
--- trunk/rosapps/packmgr/tree/irfanview.inst.rps	2006-01-03
00:10:01 UTC (rev 20539)
+++ trunk/rosapps/packmgr/tree/irfanview.inst.rps	2006-01-03
00:12:35 UTC (rev 20540)
@@ -0,0 +1,8 @@

+Sub Main
+  ' ToDo: Choose from different mirrors
+  download ("http://www.aeicomputertech.com/_downloads/iview398.exe",
"iview398.exe")
+End Sub
+
+Sub After
+  shell iview398.exe
+End Sub
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/irfanview.xml
--- trunk/rosapps/packmgr/tree/irfanview.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/irfanview.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>IrfanView</name>
+  <version>3.98</version>
+  <description>Viewer for all kinds of graphics.</description>
+  <scripts inst="irfanview.inst.rps"/>
+</package>
+
  _____  

Modified: trunk/rosapps/packmgr/tree/mozcontrol.xml
--- trunk/rosapps/packmgr/tree/mozcontrol.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/mozcontrol.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -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>
 
  _____  

Modified: trunk/rosapps/packmgr/tree/mozillacontrol.inst.rps
--- trunk/rosapps/packmgr/tree/mozillacontrol.inst.rps	2006-01-03
00:10:01 UTC (rev 20539)
+++ trunk/rosapps/packmgr/tree/mozillacontrol.inst.rps	2006-01-03
00:12:35 UTC (rev 20540)
@@ -1,5 +1,4 @@

-'Install rutine for Mozilla Control 1.6
-
+' Not in use anymore because reactos can download it without Package
Manager
 Sub Main
   download ("http://www.iol.ie/~locka/mozilla/MozillaControl16.exe",
"mozillacontrol16.exe")
 End Sub
  _____  

Added: trunk/rosapps/packmgr/tree/mplayer.inst.rps
--- trunk/rosapps/packmgr/tree/mplayer.inst.rps	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/mplayer.inst.rps	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,2 @@

+' ToDo: Find the best from all the installers and frontends
+' or add zip support for
http://www1.mplayerhq.hu/MPlayer/releases/win32/old/MPlayer-mingw32-1.0p
re7.zip
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/mplayer.xml
--- trunk/rosapps/packmgr/tree/mplayer.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/mplayer.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,13 @@

+<!--
+ToDo: 
+Chhose the right one from all the installer and GUI fronend packages
+or add zip support for the official distro
+-->
+
+<package>
+  <name>mPlayer</name>
+  <version>1.0 pre7</version>
+  <description>Commandline Media Player which works under
ReactOs.</description>
+  <scripts inst="mplayer.inst.rps"/>
+</package>
+
  _____  

Added: trunk/rosapps/packmgr/tree/openoffice.inst.rps
--- trunk/rosapps/packmgr/tree/openoffice.inst.rps	2006-01-03
00:10:01 UTC (rev 20539)
+++ trunk/rosapps/packmgr/tree/openoffice.inst.rps	2006-01-03
00:12:35 UTC (rev 20540)
@@ -0,0 +1 @@

+' ToDo: Implment Zip unpacking
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/openoffice.xml
--- trunk/rosapps/packmgr/tree/openoffice.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/openoffice.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>OpenOffice 1</name>
+  <version>1.1.5</version>
+  <description>OpenSource replacement for Microsoft
Office.</description>
+  <scripts inst="openoffice.inst.rps"/>
+</package>
+
  _____  

Added: trunk/rosapps/packmgr/tree/putty.inst.rps
--- trunk/rosapps/packmgr/tree/putty.inst.rps	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/putty.inst.rps	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,4 @@

+Sub Main
+  ' ToDo: Download putty.exe to programm files
+  download ("http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe",
"putty.exe")
+End Sub
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/putty.xml
--- trunk/rosapps/packmgr/tree/putty.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/putty.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>Putty</name>
+  <version>beta 0.58</version>
+  <description>SSH and Telnet client.</description>
+  <scripts inst="putty.inst.rps"/>
+</package>
+
  _____  

Added: trunk/rosapps/packmgr/tree/rosbe.inst.rps
--- trunk/rosapps/packmgr/tree/rosbe.inst.rps	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/rosbe.inst.rps	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,8 @@

+Sub Main
+  download
("http://blight.reactos.at/reactos-be/ReactOS%20Build%20Environment%200.
1-3.4.2.exe", "rosbe01.exe")
+End Sub
+
+Sub After
+  shell rosbe01.exe
+  ' ToDo: Delete rosbe01.exe
+End Sub
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/rosbe.xml
--- trunk/rosapps/packmgr/tree/rosbe.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/rosbe.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>Build Envirement</name>
+  <version>0.1</version>
+  <description>Allows you to build the ReactOS Source. For more
instructions see our wiki.</description>
+  <scripts inst="rosbe.inst.rps"/>
+</package>
+
  _____  

Added: trunk/rosapps/packmgr/tree/tiny.inst.rps
--- trunk/rosapps/packmgr/tree/tiny.inst.rps	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/tiny.inst.rps	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,2 @@

+' ToDo: Implement Unzipping
+' http://www.ritlabs.com/download/tinyweb/tinyweb.zip
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/tiny.xml
--- trunk/rosapps/packmgr/tree/tiny.xml	2006-01-03 00:10:01 UTC (rev
20539)
+++ trunk/rosapps/packmgr/tree/tiny.xml	2006-01-03 00:12:35 UTC (rev
20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>Ritlab Tiny Webserver</name>
+  <version>1.93</version>
+  <description>This is a simple webserver running under
ReactOs.</description>
+  <scripts inst="tiny.inst.rps"/>
+</package>
+
  _____  

Modified: trunk/rosapps/packmgr/tree/tree.xml
--- trunk/rosapps/packmgr/tree/tree.xml	2006-01-03 00:10:01 UTC (rev
20539)
+++ trunk/rosapps/packmgr/tree/tree.xml	2006-01-03 00:12:35 UTC (rev
20540)
@@ -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="Multimedia" icon="8"/>
-  <node name="Development" icon="9"/>
+  <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="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
  _____  

Modified: trunk/rosapps/packmgr/tree/tree_bare.xml
--- trunk/rosapps/packmgr/tree/tree_bare.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/tree_bare.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -1,4 +1,12 @@

 <tree>
-	<node name="Mozilla Control" file="mozcontrol.xml"/>
-	<node name="AbiWord" file="abiword.xml"/>
+	<node name="7Zip" file="7zip.xml"/>
+    <node name="AbiWord" file="abiword.xml"/>
+	<node name="Build Envirment" file="rosbe.xml"/>
+	<node name="Firefox" file="firebox.xml"/>
+	<node name="IrfanView" file="irfanview.xml"/>
+	<!--<node name="mPlayer" file="mplayer.xml"/>--> <!--
ToDo:
Choose a good one from all the installers and frondends -->
+	<!--<node name="OpenOffice 1" file="openoffice.xml"/>-->
<!--
Needs Zip support -->
+	<node name="Putty" file="putty.xml"/>
+	<node name="TuxPaint" file="tuxpaint.xml"/>
+	<node name="Tiny Webserver" file="tiny.xml"/>
 </tree>
\ No newline at end of file
  _____  

Modified: trunk/rosapps/packmgr/tree/tree_withsubs.xml
--- trunk/rosapps/packmgr/tree/tree_withsubs.xml	2006-01-03
00:10:01 UTC (rev 20539)
+++ trunk/rosapps/packmgr/tree/tree_withsubs.xml	2006-01-03
00:12:35 UTC (rev 20540)
@@ -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"/>
  _____  

Added: trunk/rosapps/packmgr/tree/tuxpaint.inst.rps
--- trunk/rosapps/packmgr/tree/tuxpaint.inst.rps	2006-01-03
00:10:01 UTC (rev 20539)
+++ trunk/rosapps/packmgr/tree/tuxpaint.inst.rps	2006-01-03
00:12:35 UTC (rev 20540)
@@ -0,0 +1,9 @@

+Sub Main
+  ' ToDo: Pick a mirror
+  download
("http://switch.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.15-
2-win32-installer.exe", "tuxpaint-inst.exe")
+End Sub
+
+Sub After
+  shell tuxpaint-inst.exe
+  ' ToDo: delete tuxpaint-inst.exe
+End Sub
\ No newline at end of file
  _____  

Added: trunk/rosapps/packmgr/tree/tuxpaint.xml
--- trunk/rosapps/packmgr/tree/tuxpaint.xml	2006-01-03 00:10:01 UTC
(rev 20539)
+++ trunk/rosapps/packmgr/tree/tuxpaint.xml	2006-01-03 00:12:35 UTC
(rev 20540)
@@ -0,0 +1,7 @@

+<package>
+  <name>TuxPaint</name>
+  <version>0.9.15-2</version>
+  <description>An open source bitmap graphics editor geared towards
young children.</description>
+  <scripts inst="tuxpaint.inst.rps"/>
+</package>
+