Changeset 149

Timestamp:

Aug 10, 2006, 4:16:00 PM (17 years ago)

Author:

Johan Enell

Message:

svn:eol-style native

Location:

trunk/se/lu/onk

Files:

• AnnotationFilter/src/annotationfilter/Filter.java (modified) (1 prop)
• AnnotationFilter/src/annotationfilter/Main.java (modified) (1 prop)
• BaseFile/src/basefile/BASEFileException.java (modified) (1 prop)
• BaseFile/src/basefile/BASEFileReader.java (modified) (1 prop)
• BaseFile/src/basefile/BASEFileSection.java (modified) (1 prop)
• BaseFile/src/basefile/BASEFileSpotSection.java (modified) (1 prop)
• BaseFile/src/basefile/BadFormatException.java (modified) (1 prop)
• BaseFile/src/basefile/BadSectionException.java (modified) (1 prop)
• BaseFile/src/basefile/InvalidSettingException.java (modified) (1 prop)
• BaseFile/src/basefile/MissingOptionException.java (modified) (1 prop)
• BaseFile/src/basefile/PluginException.java (modified) (1 prop)
• BaseFile/src/basefile/TooFewFieldsException.java (modified) (1 prop)
• BaseFile/src/basefile/TooManyFieldsException.java (modified) (1 prop)
• Center/src/center/AssayRow.java (modified) (1 prop)
• Center/src/center/Center.java (modified) (1 prop)
• Center/src/center/Main.java (modified) (1 prop)
• Center/src/center/Spot.java (modified) (1 prop)
• MergeBioAssay/lib/pluginConfiguration.base (modified) (1 prop)
• MergeBioAssay/lib/run (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/BioAssay.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/BioAssay_point.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/MergeBioAssay.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/NoGroup.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/ArithmeticIntensityMerger.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/ArithmeticRatioMerger.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/BadPatternException.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/GeometricRatioMerger.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/Merge_assay.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/Merger.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/RatioRatioMerger.java (modified) (1 prop)
• MergeBioAssay/src/mergebioassay/mergers/WeightedMerger.java (modified) (1 prop)
• MergeReplicate/src/mergereplicate/MergeReplicates.java (modified) (1 prop)
• Normalization/lib/Normalization Lowess.base (modified) (1 prop)
• Normalization/lib/lowess (modified) (1 prop)
• Normalization/src/lowess/Lowess.java (modified) (1 prop)
• Normalization/src/lowess/MASpot.java (modified) (1 prop)
• Normalization/src/lowess/Normalizer.java (modified) (1 prop)
• Normalization/src/lowess/Reporter.java (modified) (1 prop)
• Normalization/src/lowess/Spot.java (modified) (1 prop)
• Normalization/src/medianratio/MedianRatio.java (modified) (1 prop)
• Normalization/src/medianratio/Normalizer.java (modified) (1 prop)
• Normalization/src/medianratio/Reporter.java (modified) (1 prop)
• Normalization/src/medianratio/Spot.java (modified) (1 prop)
• NullPlugin/src/base1null/Base1NullPlugin.java (modified) (1 prop)
• NullPlugin/src/base1null/Reporter.java (modified) (1 prop)
• NullPlugin/src/base1null/Spot.java (modified) (1 prop)
• QPackage/lib/pluginConfiguration.base (modified) (1 prop)
• QPackage/lib/run (modified) (1 prop)
• QPackage/src/qpackage/calculator/Addition.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Calculator.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Division.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/EquationException.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Literal.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Modulo.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Multiplication.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Operand.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Operator.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Power.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Subtraction.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Token.java (modified) (1 prop)
• QPackage/src/qpackage/calculator/Variable.java (modified) (1 prop)
• QPackage/src/qpackage/qscore/Qscore.java (modified) (1 prop)
• ReplicateError/Concept.ps (modified) (1 prop) (previous)
• ReplicateError/README (modified) (1 prop)
• ReplicateError/lib/index.html (modified) (1 prop)
• ReplicateError/lib/pluginConfigurationAA.base (modified) (1 prop)
• ReplicateError/lib/pluginConfigurationWA.base (modified) (1 prop)
• ReplicateError/lib/runAA (modified) (1 prop)
• ReplicateError/lib/runWA (modified) (1 prop)
• ReplicateError/lib/tabs.html (modified) (1 prop)
• ReplicateError/src/replicateerror/AcrossAssays/HTML.java (modified) (1 prop)
• ReplicateError/src/replicateerror/AcrossAssays/ReplicateErrorAA.java (modified) (1 prop)
• ReplicateError/src/replicateerror/R.java (modified) (1 prop)
• ReplicateError/src/replicateerror/Replicate.java (modified) (1 prop)
• ReplicateError/src/replicateerror/ReplicateError.java (modified) (1 prop)
• ReplicateError/src/replicateerror/Spot.java (modified) (1 prop)
• ReplicateError/src/replicateerror/WithinAssays/ReplicateErrorWA.java (modified) (1 prop)
• Smooth/lib/pluginConfiguration.base (modified) (1 prop)
• Smooth/lib/run (modified) (1 prop)
• Smooth/src/smooth/Reporter.java (modified) (1 prop)
• Smooth/src/smooth/Smooth.java (modified) (1 prop)
• Smooth/src/smooth/SmoothMain.java (modified) (1 prop)
• Smooth/src/smooth/Spot.java (modified) (1 prop)
• VirtualArray/lib/pluginConfiguration.base (modified) (1 prop)
• VirtualArray/lib/run (modified) (1 prop)
• VirtualArray/src/virtualarray/VirtualArray.java (modified) (1 prop)
• build.xml (modified) (6 diffs, 1 prop)
• lib/base.css (modified) (1 prop)
• lib/gpl.txt (modified) (1 prop)

trunk/se/lu/onk/build.xml

@@ -29 +29 @@
   <property name="normalization.src" location="Normalization/src" />
   <property name="null.src" location="NullPlugin/src" />
+  <property name="smooth.src" location="Smooth/src" />
 
   <!-- bin -->
@@ -40 +41 @@
   <property name="normalization.bin" location="${bin}/Normalization" />
   <property name="null.bin" location="${bin}/NullPlugin" />
+  <property name="smooth.bin" location="${bin}/Smooth" />
 
   <!-- dist -->
@@ -54 +56 @@
     <ant target="center.compile" />
     <ant target="normalization.compile" />
+    <ant target="smooth.compile" />
   </target>
   
@@ -153 +156 @@
       srcdir="${normalization.src}"
       destdir="${normalization.bin}"
+      classpath="${basefile.bin}"
+      debug="true"
+      deprecation="true"
+      encoding="ISO-8859-1"
+    />
+    </target>
+  
+  <!-- - - - - - - - - - - - - - - - - - 
+      target: smooth.compile
+     - - - - - - - - - - - - - - - - - -->
+    <target name="smooth.compile" depends="basefile.compile">
+    <mkdir dir="${smooth.bin}"/>
+    <javac
+      srcdir="${smooth.src}"
+      destdir="${smooth.bin}"
       classpath="${basefile.bin}"
       debug="true"
@@ -189 +207 @@
     ================================== -->
   <target name="dist"
-    depends="svn.revision, virtualarray.dist, replicateerror.dist, mergebioassay.dist, qpackage.dist, center.dist, lowess.dist"
+    depends="svn.revision, virtualarray.dist, replicateerror.dist, mergebioassay.dist,
+      qpackage.dist, center.dist, lowess.dist, smooth.dist"
     description="--> Creates a ditributable gzipfile for each package">
     <echo message="Dist for build #${svn.build} is created." />
@@ -291 +310 @@
           <attribute name="Built-By" value="${user.name}" />
           <attribute name="Main-Class" value="lowess.Lowess" />
+        </manifest>
+    </jar>
+  </target>
+  
+  <!-- - - - - - - - - - - - - - - - - - 
+      target: smooth.dist                      
+     - - - - - - - - - - - - - - - - - -->
+  <target name="smooth.dist" depends="smooth.compile,svn.revision">
+    <mkdir dir="${dist}" />
+    <jar destfile="${dist}/smooth${svn.build}.jar">
+      <fileset dir="${basefile.src}" />
+      <fileset dir="${basefile.bin}" />
+      <fileset dir="${smooth.bin}" />
+      <fileset dir="${smooth.src}" />
+        <manifest>
+          <attribute name="Built-By" value="${user.name}"/>
+          <attribute name="Main-Class" value="smooth.SmoothMain"/>
         </manifest>
     </jar>