[Commits] (morgen) (This change previously made to the 2.5 branch, reapplying it to HEAD)

[commits at osafoundation.org]

Commit by: morgen
Modified files:
osaf/chandler/Chandler/distrib/linux/manifest.debug.linux 1.14 1.15
osaf/chandler/Chandler/distrib/linux/manifest.linux 1.31 1.32

Log message:
(This change previously made to the 2.5 branch, reapplying it to HEAD)
Updated linux manifest files to grab the wx2.5 libs, and also to make
use of the new symlink code in hardhat


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/distrib/linux/manifest.debug.linux.diff?r1=text&tr1=1.14&r2=text&tr2=1.15
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/distrib/linux/manifest.linux.diff?r1=text&tr1=1.31&r2=text&tr2=1.32

Index: osaf/chandler/Chandler/distrib/linux/manifest.linux
diff -u osaf/chandler/Chandler/distrib/linux/manifest.linux:1.31 osaf/chandler/Chandler/distrib/linux/manifest.linux:1.32
--- osaf/chandler/Chandler/distrib/linux/manifest.linux:1.31	Fri Jan 16 12:42:33 2004
+++ osaf/chandler/Chandler/distrib/linux/manifest.linux	Thu Apr 15 14:47:46 2004
@@ -13,6 +13,13 @@
 dest=bin
 python
 
+# Grab the WX libs
+src=release
+recursive=no
+dest=
+glob=libwx*
+lib
+
 # Recursively grab python libraries
 src=release/lib
 dest=lib
@@ -36,9 +43,6 @@
 recursive=no
 python2.3
 
-# Grab the WX GTK library
-libwx_gtk-2.4.so
-libwx_gtk2-2.4.so
 
 # Grab the DB libraries
 dest=lib
@@ -48,15 +52,20 @@
 libdb_java-4.2.so
 src=release/lib
 libxerces-c.so.24
+libxerces-c.so.24.0
 libpathan.so.2
+libpathan.so.2.0.2
 libxml2.so.2
+libxml2.so.2.6.3
 src=release/dbxml/lib
 libdbxml-1.2.so
 
 # Grab the gcj 3.3 runtime libs
 src=${gcj}/../lib
 libgcj.so.4
+libgcj.so.4.0.0
 libstdc++.so.5
+libstdc++.so.5.0.5
 libgcc_s.so.1
 
 # Grab Chandler.py, and others

Index: osaf/chandler/Chandler/distrib/linux/manifest.debug.linux
diff -u osaf/chandler/Chandler/distrib/linux/manifest.debug.linux:1.14 osaf/chandler/Chandler/distrib/linux/manifest.debug.linux:1.15
--- osaf/chandler/Chandler/distrib/linux/manifest.debug.linux:1.14	Fri Jan 16 12:42:33 2004
+++ osaf/chandler/Chandler/distrib/linux/manifest.debug.linux	Thu Apr 15 14:47:45 2004
@@ -13,6 +13,13 @@
 dest=bin
 python_d
 
+# Grab the WX libs
+src=debug
+recursive=no
+dest=
+glob=libwx*
+lib
+
 # Recursively grab python libraries
 src=debug/lib
 dest=lib
@@ -36,10 +43,6 @@
 recursive=no
 python2.3
 
-# Grab the WX GTK library
-libwx_gtkd-2.4.so
-libwx_gtk2d-2.4.so
-
 # Grab the DB libraries
 dest=lib
 src=debug/db/lib
@@ -48,15 +51,20 @@
 libdb_java-4.2.so
 src=debug/lib
 libxerces-c.so.24
+libxerces-c.so.24.0
 libpathan.so.2
+libpathan.so.2.0.2
 libxml2.so.2
+libxml2.so.2.6.3
 src=debug/dbxml/lib
 libdbxml-1.2.so
 
 # Grab the gcj 3.3 runtime libs
 src=${gcj}/../lib
 libgcj.so.4
+libgcj.so.4.0.0
 libstdc++.so.5
+libstdc++.so.5.0.5
 libgcc_s.so.1
 
 # Grab Chandler.py, and others