Skip to content

Commit

Permalink
Major revision
Browse files Browse the repository at this point in the history
I am starting to clean the codes and add comments
  • Loading branch information
cctsou committed Nov 9, 2015
1 parent f7a51b8 commit 83d7e5d
Show file tree
Hide file tree
Showing 583 changed files with 4,474 additions and 44,214 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,5 @@ pip-log.txt
/Umpire-SpectralLibrary/nbproject/private/
/Umpire-SpectrumParser/nbproject/private/
/Umpire-UmpireSearch/nbproject/private/
/Umpire-Utility/nbproject/private/
/Umpire-Utility/nbproject/private/
/DIA-Umpire/nbproject/private/
6 changes: 3 additions & 3 deletions DIA_Umpire_SE/build.xml → DIA-Umpire/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="DIA_Umpire_SE" default="default" basedir=".">
<description>Builds, tests, and runs the project DIA_Umpire_SE.</description>
<project name="DIA-Umpire" default="default" basedir=".">
<description>Builds, tests, and runs the project DIA-Umpire.</description>
<import file="nbproject/build-impl.xml"/>
<!--
Expand Down Expand Up @@ -58,7 +58,7 @@
An example of overriding the target for project execution could look like this:
<target name="run" depends="DIA_Umpire_SE-impl.jar">
<target name="run" depends="DIA-Umpire-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ is divided into following sections:
- cleanup
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Umpire-MathPackage-impl">
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="DIA-Umpire-impl">
<fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
Expand Down Expand Up @@ -443,7 +443,7 @@ is divided into following sections:
</fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Umpire-MathPackage" testname="TestNG tests" workingDir="${work.dir}">
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="DIA-Umpire" testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
Expand Down Expand Up @@ -594,7 +594,7 @@ is divided into following sections:
<condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
<isset property="test.method"/>
</condition>
<condition else="-suitename Umpire-MathPackage -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<condition else="-suitename DIA-Umpire -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<matches pattern=".*\.xml" string="@{testClass}"/>
</condition>
<delete dir="${build.test.results.dir}" quiet="true"/>
Expand Down Expand Up @@ -886,7 +886,7 @@ is divided into following sections:
<delete file="${built-jar.properties}" quiet="true"/>
</target>
<target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
<echo level="warn" message="Cycle detected: Umpire-MathPackage was already built"/>
<echo level="warn" message="Cycle detected: DIA-Umpire was already built"/>
</target>
<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
<mkdir dir="${build.dir}"/>
Expand All @@ -896,14 +896,6 @@ is divided into following sections:
<propertyfile file="${built-jar.properties}">
<entry key="${basedir}" value=""/>
</propertyfile>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-jar.properties}"/>
<param location="${project.Umpire-BaseDataStructure}" name="call.subproject"/>
<param location="${project.Umpire-BaseDataStructure}/build.xml" name="call.script"/>
<param name="call.target" value="jar"/>
<param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
<param name="transfer.not.archive.disabled" value="true"/>
</antcall>
</target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
<target depends="init" name="-check-automatic-build">
Expand Down Expand Up @@ -1379,7 +1371,7 @@ is divided into following sections:
<delete file="${built-clean.properties}" quiet="true"/>
</target>
<target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
<echo level="warn" message="Cycle detected: Umpire-MathPackage was already built"/>
<echo level="warn" message="Cycle detected: DIA-Umpire was already built"/>
</target>
<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
<mkdir dir="${build.dir}"/>
Expand All @@ -1389,14 +1381,6 @@ is divided into following sections:
<propertyfile file="${built-clean.properties}">
<entry key="${basedir}" value=""/>
</propertyfile>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-clean.properties}"/>
<param location="${project.Umpire-BaseDataStructure}" name="call.subproject"/>
<param location="${project.Umpire-BaseDataStructure}/build.xml" name="call.script"/>
<param name="call.target" value="clean"/>
<param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
<param name="transfer.not.archive.disabled" value="true"/>
</antcall>
</target>
<target depends="init" name="-do-clean">
<delete dir="${build.dir}"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build.xml.data.CRC32=a0da9986
build.xml.script.CRC32=95b98002
build.xml.data.CRC32=7a8885c7
build.xml.script.CRC32=2812794d
build.xml.stylesheet.CRC32=[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=a0da9986
nbproject/build-impl.xml.script.CRC32=58600bf1
nbproject/build-impl.xml.data.CRC32=7a8885c7
nbproject/build-impl.xml.script.CRC32=30697698
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
Loading

0 comments on commit 83d7e5d

Please sign in to comment.