Skip to content

Commit 2a29a2c

Browse files
adamkoryntaadamkorynta
authored
Merge pull request #9 from CalSimCalLite/release-iteration2
Release iteration2
2 parents a7a5a5f + b1f2a94 commit 2a29a2c

1,498 files changed

Lines changed: 75290 additions & 33970 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
.idea/copyright/HEC.xml
55
.idea/workspace.xml
66
.idea/compiler.xml
7+
.idea/misc.xml
78
/*/target/*

‎.idea/compiler.xml‎

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/EPPT.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/profiles_settings.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ The DWR Enhanced Post Processor Tool (EPPT) is a Windows desktop user interface
55
2. DTS Report, similar to Quick Results but introduces derived time series (DTS) that allows for comparison between model variables.
66
3. Schematic View (*will be developed in a subsequent version), comparison and drill-down of model runs presented using a schematic view of the system.
77
4. QA/QC Report, model run comparison presented as a PDF report that includes summary information and detailed graphs and tables.
8+
9+
# Module Dependency Graph
10+
11+
![Dependency Graph](https://github.com/CalSimCalLite/DWR-Enhanced-Post-Processing-Tool/blob/master/DependencyGraph.png)

‎application/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/target/
2+
/bin/

‎application/pom.xml‎

Lines changed: 94 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2019
4-
~ California Department of Water Resources
5-
~ All Rights Reserved. DWR PROPRIETARY/CONFIDENTIAL.
6-
~ Source may not be released without written approval from DWR
3+
~ Enhanced Post Processing Tool (EPPT) Copyright (c) 2019.
4+
~
5+
~ EPPT is copyrighted by the State of California, Department of Water Resources. It is licensed
6+
~ under the GNU General Public License, version 2. This means it can be
7+
~ copied, distributed, and modified freely, but you may not restrict others
8+
~ in their ability to copy, distribute, and modify it. See the license below
9+
~ for more details.
10+
~
11+
~ GNU General Public License
712
-->
813

914
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -12,7 +17,7 @@
1217
<parent>
1318
<groupId>gov.ca.water</groupId>
1419
<artifactId>eppt-parent</artifactId>
15-
<version>1.0.0-SNAPSHOT</version>
20+
<version>1.0.1-SNAPSHOT</version>
1621
<relativePath>../eppt-parent</relativePath>
1722
</parent>
1823

@@ -24,7 +29,7 @@
2429
<properties>
2530
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2631
<all.clusters>${project.build.directory}/${brandingToken}</all.clusters>
27-
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
32+
<zip-dist-name>DWR-EPPT</zip-dist-name>
2833
</properties>
2934

3035
<dependencies>
@@ -49,6 +54,11 @@
4954
<artifactId>eppt-core</artifactId>
5055
<version>${project.version}</version>
5156
</dependency>
57+
<dependency>
58+
<groupId>${project.groupId}</groupId>
59+
<artifactId>eppt-jasper-engine</artifactId>
60+
<version>${project.version}</version>
61+
</dependency>
5262
<!-- NbModuleSuite functional in RELEASE70 or later: -->
5363
<dependency>
5464
<groupId>org.netbeans.api</groupId>
@@ -76,6 +86,11 @@
7686
<version>5.3.1</version>
7787
<scope>test</scope>
7888
</dependency>
89+
<dependency>
90+
<groupId>org.codehaus.groovy</groupId>
91+
<artifactId>groovy</artifactId>
92+
<version>2.5.6</version>
93+
</dependency>
7994
</dependencies>
8095

8196
<build>
@@ -85,7 +100,7 @@
85100
<artifactId>nbm-maven-plugin</artifactId>
86101
<extensions>true</extensions>
87102
<configuration>
88-
<finalName>DWR-EPPT</finalName>
103+
<finalName>${zip-dist-name}</finalName>
89104
<brandingToken>${brandingToken}</brandingToken>
90105
<debugAdditionalArguments>
91106
-J"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5164" -J-Xmx2g
@@ -106,31 +121,56 @@
106121
</plugin>
107122
</plugins>
108123
</build>
109-
110124
<profiles>
111125
<profile>
112126
<id>deployment</id>
113127
<build>
128+
114129
<plugins>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-dependency-plugin</artifactId>
133+
<version>3.1.1</version>
134+
<executions>
135+
<execution>
136+
<id>copy-dependencies</id>
137+
<phase>compile</phase>
138+
<goals>
139+
<goal>copy</goal>
140+
</goals>
141+
</execution>
142+
</executions>
143+
<configuration>
144+
<outputDirectory>${project.build.directory}</outputDirectory>
145+
<artifactItems>
146+
<artifactItem>
147+
<groupId>oracle</groupId>
148+
<artifactId>jre</artifactId>
149+
<version>1.8.0_202</version>
150+
<type>zip</type>
151+
</artifactItem>
152+
</artifactItems>
153+
</configuration>
154+
</plugin>
115155
<plugin>
116156
<groupId>org.codehaus.mojo</groupId>
117157
<artifactId>nbm-maven-plugin</artifactId>
118158
<executions>
119159
<execution>
120160
<id>extra</id>
121161
<goals>
122-
<goal>build-installers</goal>
123-
<goal>cluster-app</goal>
162+
<goal>standalone-zip</goal>
163+
<goal>run-platform</goal>
124164
</goals>
125165
</execution>
126166
</executions>
127167
<configuration>
128-
<installersFilePrefix>DWR-EPPT</installersFilePrefix>
168+
<installersFilePrefix>${zip-dist-name}-${maven.build.timestamp}</installersFilePrefix>
129169
<installerOsLinux>false</installerOsLinux>
130170
<installerOsMacosx>false</installerOsMacosx>
131171
<installerOsSolaris>false</installerOsSolaris>
132172
<installerPack200Enable>true</installerPack200Enable>
133-
<installerOsWindows>true</installerOsWindows>
173+
<installerOsWindows>false</installerOsWindows>
134174
<userSettings>
135175
<configuration.logic.file>
136176
${basedir}/src/installer/ConfigurationLogic.java
@@ -141,9 +181,50 @@
141181
<etcConfFile>src/nbproject/eppt.conf</etcConfFile>
142182
<brandingToken>${brandingToken}</brandingToken>
143183
<binDirectory>${basedir}/src/installer/binaries</binDirectory>
144-
184+
<licenseFile>${basedir}/src/nbproject/license.txt</licenseFile>
145185
</configuration>
146186
</plugin>
187+
<plugin>
188+
<groupId>org.codehaus.mojo</groupId>
189+
<artifactId>build-helper-maven-plugin</artifactId>
190+
<version>1.8</version>
191+
<executions>
192+
<execution>
193+
<id>parse-version</id>
194+
<goals>
195+
<goal>parse-version</goal>
196+
</goals>
197+
</execution>
198+
</executions>
199+
</plugin>
200+
<plugin>
201+
<groupId>org.apache.maven.plugins</groupId>
202+
<artifactId>maven-antrun-plugin</artifactId>
203+
<version>1.8</version>
204+
<executions>
205+
<execution>
206+
<id>copy-resource-one</id>
207+
<phase>package</phase>
208+
<goals>
209+
<goal>run</goal>
210+
</goals>
211+
<configuration>
212+
<target>
213+
<unzip src="${project.build.directory}\jre-1.8.0_202.zip" dest="${project.build.directory}\dwr_eppt\jre"/>
214+
<copy file="${project.basedir}/src/EPPT.exe" todir="${project.build.directory}\dwr_eppt"/>
215+
<exec executable="cmd">
216+
<arg value="/c"/>
217+
<arg value="C:\Program Files\7-Zip\7z.exe"/>
218+
<arg value="a"/>
219+
<arg value="-sfx"/>
220+
<arg value="${project.build.directory}\${zip-dist-name}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-${maven.build.timestamp}.exe"/>
221+
<arg value="${project.build.directory}\dwr_eppt"/>
222+
</exec>
223+
</target>
224+
</configuration>
225+
</execution>
226+
</executions>
227+
</plugin>
147228
</plugins>
148229
</build>
149230
</profile>

‎application/src/EPPT.exe‎

171 KB
Binary file not shown.

‎application/src/bin/app64.exe‎

1.19 MB
Binary file not shown.

0 commit comments

Comments
 (0)