[Wonder-cvs] CVS: Wonder/Build/build generic.xml,1.19,1.20

[Anjo K. <an...@us...>]

Update of /cvsroot/wonder/Wonder/Build/build
In directory sc8-pr-cvs1:/tmp/cvs-serv9268

Modified Files:
	generic.xml 
Log Message:
Resorting the loading order of EOPrototypes. This framework *must* come before any other that makes use of it in the loading order, else for example the prefs-handling fails in very obscure ways.


Index: generic.xml
===================================================================
RCS file: /cvsroot/wonder/Wonder/Build/build/generic.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** generic.xml	13 Mar 2003 07:37:56 -0000	1.19
--- generic.xml	28 Apr 2003 16:31:02 -0000	1.20
***************
*** 103,110 ****
  
              <!-- set this if you want to use Wonder's DynaGrouping, or leave out if not -->
!             <param name="use.wonder.grouping" value="true" />
  
              <!-- set this if you want to use Wonder's DynaReporting, or leave out if not -->
!             <param name="use.wonder.reporting" value="true" />
  
              <!-- set this if you want to use your own built frameworks, or leave out if not -->
--- 103,110 ----
  
              <!-- set this if you want to use Wonder's DynaGrouping, or leave out if not -->
!             <param name="use.grouping" value="true" />
  
              <!-- set this if you want to use Wonder's DynaReporting, or leave out if not -->
!             <param name="use.reporting" value="true" />
  
              <!-- set this if you want to use your own built frameworks, or leave out if not -->
***************
*** 380,383 ****
--- 380,386 ----
              </frameworks>
              <frameworks root="${wonder.lib.root}" if="use.wonder.logic"> 
+                 <include name="ERPrototypes.framework" />
+             </frameworks>
+             <frameworks root="${wonder.lib.root}" if="use.wonder.logic"> 
                  <include name="ERCoreBusinessLogic.framework" />
              </frameworks>
***************
*** 559,562 ****
--- 562,575 ----
      </target>
      
+     <target name="ERPrototypes.all">
+         <antcall target="global.framework" >
+             <param name="project.principal.class" value="" />
+             <param name="project.name" value="ERPrototypes" />
+             <param name="project.dir" value="Common/Frameworks/ERPrototypes" />
+ 
+             <param name="use.wonder.core" value="true" />
+         </antcall>
+     </target>
+ 
      <target name="ERCoreBusinessLogic.all">
          <antcall target="global.framework" >
***************
*** 902,906 ****
  
      <target name="core.all" depends="ERJars.all, JavaWOExtensions.all, ERExtensions.all, ERDirectToWeb.all" />
!     <target name="frameworks.all" depends="core.all, ERNeutralLook.all, WOOgnl.all, ERCoreBusinessLogic.all, ERJavaMail.all, ERChangeNotificationJMS.all, ERCalendar.all" />
      <target name="bugtracker.all" depends="frameworks.all, BTBusinessLogic.all, BugTracker.all" />
      <target name="applications.all" depends="frameworks.all, bugtracker.all, ERMailer.all" />
--- 915,919 ----
  
      <target name="core.all" depends="ERJars.all, JavaWOExtensions.all, ERExtensions.all, ERDirectToWeb.all" />
!     <target name="frameworks.all" depends="core.all, ERNeutralLook.all, WOOgnl.all, ERPrototypes.all, ERCoreBusinessLogic.all, ERJavaMail.all, ERChangeNotificationJMS.all, ERCalendar.all" />
      <target name="bugtracker.all" depends="frameworks.all, BTBusinessLogic.all, BugTracker.all" />
      <target name="applications.all" depends="frameworks.all, bugtracker.all, ERMailer.all" />
***************
*** 936,939 ****
--- 949,955 ----
          </antcall>
          <antcall target="global.clean.framework" >
+             <param name="project.name" value="ERPrototypes" />
+         </antcall>
+         <antcall target="global.clean.framework" >
              <param name="project.name" value="ERCoreBusinessLogic" />
          </antcall>
***************
*** 1047,1050 ****
--- 1063,1069 ----
          </antcall>
          <antcall target="global.web.framework" >
+             <param name="project.name" value="ERPrototypes" />
+         </antcall>
+         <antcall target="global.web.framework" >
              <param name="project.name" value="ERCoreBusinessLogic" />
          </antcall>
***************
*** 1154,1157 ****
--- 1173,1179 ----
          <antcall target="global.install.framework" >
              <param name="project.name" value="ERDirectToWeb" />
+         </antcall>
+         <antcall target="global.install.framework" >
+             <param name="project.name" value="ERPrototypes" />
          </antcall>
          <antcall target="global.install.framework" >