Move Bootleg to Non-Validated, remove bootleg installer

APSIMInitiative · Sep 11, 2019 · c4857a6 · c4857a6
1 parent cfea03d
commit c4857a6
Show file tree

Hide file tree

Showing 18 changed files with 129 additions and 128 deletions.
diff --git a/Apsim.xml b/Apsim.xml
@@ -20,6 +20,7 @@
     <ReadOnlyFiles>Graph.xml</ReadOnlyFiles>
     <ReadOnlyFiles>Soils.soils</ReadOnlyFiles>
     <ReadOnlyFiles>Management.xml</ReadOnlyFiles>
+    <ReadOnlyFiles>Non-Validated.xml</ReadOnlyFiles>
     <ReadOnlyFiles>GenericFunctions.xml</ReadOnlyFiles>
     <helpheight>231</helpheight>
     <toolboxheight>196</toolboxheight>
@@ -32,7 +33,7 @@
     <PlugIn enabled="yes">%apsim%/UserInterface/SoilTypes.xml</PlugIn>
     <PlugIn enabled="yes">%apsim%/UserInterface/GenericFunctionsIDE.xml</PlugIn>
     <PlugIn enabled="yes">%apsim%/UserInterface/Graph.xml</PlugIn>
-    <PlugIn enabled="yes">%apsim%/UserInterface/DevelopersPlugIn.xml</PlugIn> 
+    <PlugIn enabled="yes">%apsim%/UserInterface/Non-Validated.xml</PlugIn> 
     <PlugIn enabled="yes">%apsim%/Model/SlurryTank.xml</PlugIn>
     <PlugIn enabled="yes">%apsim%/Model/Pigs.xml</PlugIn>
     <PlugIn enabled="yes">%apsim%/Model/FeedItem.xml</PlugIn>
@@ -184,7 +185,6 @@
     <PlugIn enabled="yes">%apsim%/Model/AFSupplement.xml</PlugIn>
     <ToolBox>%apsim%\UserInterface\ToolBoxes\AusFarm.xml</ToolBox>
     <PlugIn enabled="yes">%apsim%/UserInterface/Ausfarm.xml</PlugIn>
-
   </ApsimUI>
   <APSoil>
     <ActionFile>%apsim%\UserInterface\ApsoilActions.xml</ActionFile>

diff --git a/Examples/Advanced/GriddedGrazedPaddock.apsim b/Examples/Advanced/GriddedGrazedPaddock.apsim
@@ -41,7 +41,7 @@ See the simulation "GriddedGrazedPaddockWithExtras" in the other folder in this
         <PlugIn enabled="yes">%apsim%\UserInterface\GenericFunctionsIDE.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\UserInterface\Graph.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\UserInterface\Ausfarm.xml</PlugIn>
-        <PlugIn enabled="yes">%apsim%\UserInterface\DevelopersPlugIn.xml</PlugIn>
+        <PlugIn enabled="yes">%apsim%\UserInterface\Non-Validated.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\Model\SlurryTank.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\Model\WHEATSTRAW.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\Model\WASHWATER.xml</PlugIn>
@@ -2140,7 +2140,7 @@ The amounts of NH4 or NO3 are those summed for the entire soil depth.  The perce
         <PlugIn enabled="yes">%apsim%\UserInterface\GenericFunctionsIDE.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\UserInterface\Graph.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\UserInterface\Ausfarm.xml</PlugIn>
-        <PlugIn enabled="yes">%apsim%\UserInterface\DevelopersPlugIn.xml</PlugIn>
+        <PlugIn enabled="yes">%apsim%\UserInterface\Developers</PlugIn>
         <PlugIn enabled="yes">%apsim%\Model\SlurryTank.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\Model\WHEATSTRAW.xml</PlugIn>
         <PlugIn enabled="yes">%apsim%\Model\WASHWATER.xml</PlugIn>

diff --git a/Examples/Wether Lucerne Supplement.apsim b/Examples/Wether Lucerne Supplement.apsim
@@ -5,7 +5,7 @@
       <PlugIn enabled="yes">%apsim%\UserInterface\SoilTypes.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\GenericFunctionsIDE.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\Graph.xml</PlugIn>
-      <PlugIn enabled="yes">%apsim%\UserInterface\DevelopersPlugIn.xml</PlugIn>
+      <PlugIn enabled="yes">%apsim%\UserInterface\Non-Validated.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\SlurryTank.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\Pigs.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\FeedItem.xml</PlugIn>

diff --git a/Model/Build/BuildAll.xml b/Model/Build/BuildAll.xml
@@ -15,12 +15,6 @@
          <CommandLine>make</CommandLine>
          <CommandLineUnix>/bin/true</CommandLineUnix>
       </Job>
-      <Job name="Create Bootleg MSI">
-	     <DependsOn>Compile InsertFilesIntoSetup</DependsOn>
-         <WorkingDirectory>%APSIM%/Release</WorkingDirectory>
-         <CommandLine>%APSIM%\Release\CreateInstall.bat %PatchFileNameShort%.Bootleg Bootleg</CommandLine>
-         <CommandLineUnix>/bin/true</CommandLineUnix>
-      </Job>
       <Job name="Create Release MSI">
 	     <DependsOn>Compile InsertFilesIntoSetup</DependsOn>
          <WorkingDirectory>%APSIM%\Release</WorkingDirectory>

diff --git a/Release/ApsimSetup.iss b/Release/ApsimSetup.iss
@@ -4,10 +4,10 @@
 
 #include  "ISPPBuiltins.iss"
 
-#ifndef BOOTLEG
-#include <.\ModelExcludes.iss>
-#include <.\UserInterfaceExcludes.iss>
-#endif
+;#ifndef BOOTLEG
+;#include <.\ModelExcludes.iss>
+;#include <.\UserInterfaceExcludes.iss>
+;#endif
 
 #ifndef ModelExcludedFiles
 #define ModelExcludedFiles ""

diff --git a/Release/Exclusions.txt b/Release/Exclusions.txt
@@ -90,8 +90,8 @@ Model\Wheat2.xml
 Model\WheatSWIM.xml
 Model\Wheat2X.xml
 Model\WHEATSTRAW.xml
-UserInterface\DevelopersPlugIn.xml
+UserInterface\Non-Validated.xml
 UserInterface\Plant2IDE.xml
 UserInterface\Plant2IDEActions.xml
 UserInterface\ToolBoxes\Plant2.xml
-UserInterface\ToolBoxes\Developers.xml
+UserInterface\ToolBoxes\Non-Validated.xml
diff --git a/Release/UserInterfaceExcludes.iss b/Release/UserInterfaceExcludes.iss
@@ -1,6 +1,6 @@
 #define UserInterfaceExcludedFiles \
-"DevelopersPlugIn.xml, \
+"Non-Validated.xml, \
 Plant2IDE.xml, \
 Plant2IDEActions.xml, \
 ToolBoxes\Plant2.xml, \
-ToolBoxes\Developers.xml"
+ToolBoxes\Non-Validated.xml"
diff --git a/Tests/Manager2/DateTest.apsim b/Tests/Manager2/DateTest.apsim
@@ -13,7 +13,7 @@
       <PlugIn enabled="yes">%apsim%\UserInterface\SoilTypes.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\Graph.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\Ausfarm.xml</PlugIn>
-      <PlugIn enabled="yes">%apsim%\UserInterface\DevelopersPlugIn.xml</PlugIn>
+      <PlugIn enabled="yes">%apsim%\UserInterface\Non-Validated.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\SlurryTank.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\simpleBuilding.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\atmosphere.xml</PlugIn>
@@ -926,4 +926,4 @@ End Class
       </manager2>
     </area>
   </simulation>
-</folder>
+</folder>
diff --git a/Tests/Manager2/Plant2Reference.apsim b/Tests/Manager2/Plant2Reference.apsim
@@ -13,7 +13,7 @@
       <PlugIn enabled="yes">%apsim%\UserInterface\SoilTypes.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\Graph.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\Ausfarm.xml</PlugIn>
-      <PlugIn enabled="yes">%apsim%\UserInterface\DevelopersPlugIn.xml</PlugIn>
+      <PlugIn enabled="yes">%apsim%\UserInterface\Developers</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\SlurryTank.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\simpleBuilding.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\atmosphere.xml</PlugIn>
@@ -936,4 +936,4 @@ End Class
       </manager2>
     </area>
   </simulation>
-</folder>
+</folder>
diff --git a/Tests/Manager2/Plant2_ComponentModel.apsim b/Tests/Manager2/Plant2_ComponentModel.apsim
@@ -13,7 +13,7 @@
       <PlugIn enabled="yes">%apsim%\UserInterface\SoilTypes.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\Graph.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\UserInterface\Ausfarm.xml</PlugIn>
-      <PlugIn enabled="yes">%apsim%\UserInterface\DevelopersPlugIn.xml</PlugIn>
+      <PlugIn enabled="yes">%apsim%\UserInterface\Developers</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\SlurryTank.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\simpleBuilding.xml</PlugIn>
       <PlugIn enabled="yes">%apsim%\Model\atmosphere.xml</PlugIn>
@@ -1141,4 +1141,4 @@ public class Script
       </Graph>
     </area>
   </simulation>
-</folder>
+</folder>