ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-11 13:05:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add version number to java build

Browse Source
This commit is contained in:
Scott Fennell 2020-02-03 12:57:14 -06:00
parent 4e6c4b63a8
commit 619198ea4a
4 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
project(trick) project(trick)
set(TRICK_MAJOR 19) set(TRICK_MAJOR 19)
set(TRICK_MINOR 1) set(TRICK_MINOR 0)
set(TRICK_TINY dev) set(TRICK_TINY 1)
#set(CMAKE_VERBOSE_MAKEFILE ON) #set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)

2
trick_source/java/CMakeLists.txt
View File

@ -3,4 +3,4 @@
# Build Java # Build Java
############################################################### ###############################################################
add_custom_target(java COMMAND ${MAVEN_EXECUTABLE} -q package -Dcmake=true -DbuildDirectory=${CMAKE_BINARY_DIR}/libexec/trick/java/build WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) add_custom_target(java COMMAND ${MAVEN_EXECUTABLE} -q package -Dcmake=true -DbuildDirectory=${CMAKE_BINARY_DIR}/libexec/trick/java/build -DTRICK_VERSION="${TRICK_MAJOR}.${TRICK_MINOR}.${TRICK_TINY}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

4
trick_source/java/Makefile
View File

@ -6,11 +6,11 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
all: all:
@echo "Building java application..." @echo "Building java application..."
@${MVN} -q package @${MVN} package -q -Dcmake=false
javadoc: javadoc:
${MVN} javadoc:javadoc ${MVN} javadoc:javadoc
clean: clean:
@${MVN} -q clean @${MVN} -q clean -Dcmake=false
@echo java build directory cleaned. @echo java build directory cleaned.

46
trick_source/java/pom.xml
View File

@ -6,16 +6,47 @@
<groupId>trick-java</groupId> <groupId>trick-java</groupId>
<artifactId>trick-java</artifactId> <artifactId>trick-java</artifactId>
<version>1.0</version> <version>${trick_version}</version>
<name>trick-java</name> <name>trick-java</name>
<url>https://github.com/nasa/trick</url> <url>https://github.com/nasa/trick</url>
<profiles>
<profile>
<id>cmake</id>
<build>
<directory>${buildDirectory}</directory>
</build>
<properties>
<trick_version>${TRICK_VERSION}</trick_version>
</properties>
<activation>
<property>
<name>cmake</name>
<value>true</value>
</property>
</activation>
</profile>
<profile>
<id>makefile</id>
<properties>
<trick_version>${env.TRICK_VERSION}</trick_version>
</properties>
<activation>
<property>
<name>cmake</name>
<value>false</value>
</property>
</activation>
</profile>
</profiles>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<trick_version>dev</trick_version>
</properties> </properties>
<dependencies> <dependencies>
@ -316,17 +347,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<profiles>
<profile>
<build>
<directory>${buildDirectory}</directory>
</build>
<activation>
<property>
<name>cmake</name>
<value>true</value>
</property>
</activation>
</profile>
</profiles>
</project> </project>