From 0936d99aac64fc7b38b8676e6543a5c99e21e464 Mon Sep 17 00:00:00 2001
From: "Unknown (abagchi)" <dev-null@apache.org>
Date: Thu, 17 Feb 2000 23:45:13 +0000
Subject: [PATCH] Corrected it for new files and structure

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@171853 13f79535-47bb-0310-9956-ffa450edef68
---
 scripts/packageBinaries.pl | 65 ++++++--------------------------------
 scripts/packageSources.pl  | 13 +++-----
 2 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/scripts/packageBinaries.pl b/scripts/packageBinaries.pl
index e0c98be05..6d2d8efae 100644
--- a/scripts/packageBinaries.pl
+++ b/scripts/packageBinaries.pl
@@ -129,61 +129,10 @@ if ($platform =~ m/Windows/) {
         chdir ("$XERCESCROOT");
         system ("del /s /f *.dep *.ncb *.plg *.opt");
 
-        # Make the XERCES-C dll
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/XercesLib");
-        print "Executing: msdev XercesLib.dsp /MAKE \"XercesLib - $platformname $buildmode\" /REBUILD";
-	system("msdev XercesLib.dsp /MAKE \"XercesLib - $platformname $buildmode\" /REBUILD");
-
-        # Make the SAXCount sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/SAXCount");
-        print "Executing: msdev SAXCount.dsp /MAKE \"SAXCount - $platformname $buildmode\" /REBUILD";
-	system("msdev SAXCount.dsp /MAKE \"SAXCount - $platformname $buildmode\" /REBUILD");
-
-        # Make the SAXPrint sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/SAXPrint");
-        print "Executing: msdev SAXPrint.dsp /MAKE \"SAXPrint - $platformname $buildmode\" /REBUILD";
-	system("msdev SAXPrint.dsp /MAKE \"SAXPrint - $platformname $buildmode\" /REBUILD");
-
-        # Make the DOMCount sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/DOMCount");
-        print "Executing: msdev DOMCount.dsp /MAKE \"DOMCount - $platformname $buildmode\" /REBUILD";
-	system("msdev DOMCount.dsp /MAKE \"DOMCount - $platformname $buildmode\" /REBUILD");
-
-        # Make the DOMPrint sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/DOMPrint");
-        print "Executing: msdev DOMPrint.dsp /MAKE \"DOMPrint - $platformname $buildmode\" /REBUILD";
-	system("msdev DOMPrint.dsp /MAKE \"DOMPrint - $platformname $buildmode\" /REBUILD");
-
-        # Make the Redirect sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/Redirect");
-        print "Executing: msdev Redirect.dsp /MAKE \"Redirect - $platformname $buildmode\" /REBUILD";
-	system("msdev Redirect.dsp /MAKE \"Redirect - $platformname $buildmode\" /REBUILD");
-
-
-        # Make the MemParse sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/MemParse");
-        print "Executing: msdev MemParse.dsp /MAKE \"MemParse - $platformname $buildmode\" /REBUILD";
-	system("msdev MemParse.dsp /MAKE \"MemParse - $platformname $buildmode\" /REBUILD");
-
-        # Make the PParse sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/PParse");
-        print "Executing: msdev PParse.dsp /MAKE \"PParse - $platformname $buildmode\" /REBUILD";
-	system("msdev PParse.dsp /MAKE \"PParse - $platformname $buildmode\" /REBUILD");
-
-        # Make the StdInParse sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/StdInParse");
-        print "Executing: msdev StdInParse.dsp /MAKE \"StdInParse - $platformname $buildmode\" /REBUILD";
-	system("msdev StdInParse.dsp /MAKE \"StdInParse - $platformname $buildmode\" /REBUILD");
-
-        # Make the EnumVal sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/EnumVal");
-        print "Executing: msdev EnumVal.dsp /MAKE \"EnumVal - $platformname $buildmode\" /REBUILD";
-	system("msdev EnumVal.dsp /MAKE \"EnumVal - $platformname $buildmode\" /REBUILD");
-
-        # Make the CreateDOMDocument sample
-        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all/CreateDOMDocument");
-        print "Executing: msdev CreateDOMDocument.dsp /MAKE \"CreateDOMDocument - $platformname $buildmode\" /REBUILD";
-	system("msdev CreateDOMDocument.dsp /MAKE \"CreateDOMDocument - $platformname $buildmode\" /REBUILD");
+        # Make all files in the Xerces-C system including libraries, samples and tests
+        chdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all");
+        print "Executing: msdev xerces-all.dsp /MAKE \"all - $platformname $buildmode\" /REBUILD";
+	system("msdev xerces-all.dsw /MAKE \"all - $platformname $buildmode\" /REBUILD");
 
         # Decide where you want the build copied from
         chdir ($targetdir);
@@ -408,6 +357,12 @@ if ( ($platform =~ m/AIX/i)    || ($platform =~ m/HP-UX/i) ||
         system ("gmake clean");	# May want to comment this line out to speed up
         system ("gmake");
 
+        # Next build the tests
+        chdir ("$XERCESCROOT/tests");
+        system ("runConfigure -p$platform -c$opt_c -x$opt_x");
+        system ("gmake clean");	# May want to comment this line out to speed up
+        system ("gmake");
+
         chdir ($targetdir);
 
         # Populate the include output directory
diff --git a/scripts/packageSources.pl b/scripts/packageSources.pl
index 5a242664a..084bdf2be 100644
--- a/scripts/packageSources.pl
+++ b/scripts/packageSources.pl
@@ -175,7 +175,6 @@ sub package_sources {
       chdir ("$srctargetdir/samples");
       system("autoconf");
    }
-
    
    # Delete the irrelevant parts before the packaging
    system("$RM -f $srctargetdir/CMVC.GON");
@@ -192,17 +191,15 @@ sub package_sources {
    system("$RM -rf $srctargetdir/doc/*.zip");
 
    system("$RM -rf $srctargetdir/Projects/Win32/Unsupported");
-   system("$RM -rf $srctargetdir/samples/Projects/Win32/VC5");
-   system("$RM -rf $srctargetdir/src/dom/DomTest");
-   system("$RM -rf $srctargetdir/src/dom/DOMMemTest");
-   system("$RM -rf $srctargetdir/src/util/tests");
-   system("$RM -rf $srctargetdir/src/internal/ParserTest");
-   system("$RM -rf $srctargetdir/tests");
-   system("$RM -rf $srctargetdir/Tools");
+   system("$RM -rf $srctargetdir/Projects/Win32/BCB4");
    system("$RM $srctargetdir/scripts/packageSources.pl");
 
    chdir ($srctargetdir);
    system("$RM -rf *.opt");
+   system("$RM -rf *.o");
+   system("$RM -rf *.so");
+   system("$RM -rf *.sl");
+   system("$RM -rf *.a");
    system("$RM -rf *.ncb");
    system("$RM -rf *.plg");
    system("$RM -rf #*");
-- 
GitLab