Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added circle.yml to build europa on CircleCi #175

Open
wants to merge 155 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
903c302
Missed PLASMA cmake utilities
miatauro-NASA Jul 13, 2014
8c4e1cf
Starting to add Java compilation (not quite building correctly there)
miatauro-NASA Jul 20, 2014
01d3adf
-Added partial specialization of PSList template for pointer types to…
miatauro-NASA Jul 22, 2014
69e242e
Adding "export" to installation so cmake projects can just include a …
miatauro-NASA Jul 24, 2014
2b6300f
Adding a CMake module for finding ANTLR
miatauro-NASA Jul 25, 2014
76ced00
-Bumped up CMake required version
miatauro-NASA Jul 25, 2014
4bfd76b
Added optimized compilation
miatauro-NASA Jul 25, 2014
1ce9dee
Adding 64/32-bit builds
miatauro-NASA Jul 25, 2014
ef8f8df
Fixed the dependency problem between PSEngineGenerated and PSEngine. …
miatauro-NASA Jul 28, 2014
49c1570
Added NDDL error reporting to the project template. Addresses the is…
miatauro-NASA Aug 7, 2014
a7d91ea
Domains.cc: IntervalDomain now notifies on calls to set(). This was …
miatauro-NASA Aug 15, 2014
0be8526
For detailed commentary on these changes, see issue #132, comment #4
miatauro-NASA Aug 19, 2014
5b3da1d
-Changed some indentation
miatauro-NASA Aug 21, 2014
44ce7d3
Adding resource handling to the default planner config. Addresses pa…
miatauro-NASA Aug 21, 2014
2fc9306
Added CMakeLists for examples
miatauro-NASA Sep 4, 2014
de7f322
-Refactored the profile graph into its own file
miatauro-NASA Sep 8, 2014
04a7986
This commit fixes issue 101 and a resource test failure.
miatauro-NASA Sep 12, 2014
7a29145
-Small syntactic fixes for OS X
miatauro-NASA Sep 13, 2014
06ce84e
-Adding direct finding of the Boost libraries
miatauro-NASA Sep 19, 2014
5265f1c
Addresses issue 26
miatauro-NASA Sep 22, 2014
1e62e4a
Addresses issue 4
miatauro-NASA Sep 22, 2014
71f6fad
Test for the GuardFilter/NotGuardFilter related to issue 69.
miatauro-NASA Sep 22, 2014
da85f61
Committed error check to "address" issue 134. More thought needs to …
miatauro-NASA Sep 22, 2014
b59aae4
src/Java/JavaUI/CMakeLists.txt: Comment cleanup, revised call to unjar
miatauro-NASA Sep 23, 2014
ef5fa34
Remove trailing whitespaces and tabs
jubalh Nov 1, 2014
37bc9b2
Adding .travis.yml to start CI configuration
miatauro-NASA Nov 3, 2014
018ffa7
-Moving CMake requirement down one revision for Travis CI
miatauro-NASA Nov 3, 2014
1c8cf63
-Small fix to CMake files to report errors rather than produce errors
miatauro-NASA Nov 3, 2014
6e43165
Trying to add installation of boost
miatauro-NASA Nov 3, 2014
eca4448
Forgot to tell apt-get to install boost
miatauro-NASA Nov 3, 2014
55301c1
Temporarily having command list all available packages
miatauro-NASA Nov 3, 2014
07707f4
Trying to add boost installation
miatauro-NASA Nov 4, 2014
7adcfff
More trying to install boost
miatauro-NASA Nov 4, 2014
cb091ce
Left a spurious . that I think is causing Travis to try to install al…
miatauro-NASA Nov 4, 2014
43932a4
Adding cppunit
miatauro-NASA Nov 4, 2014
3d7a748
Adding installation of antlr and removing (currently) unused europa-c…
miatauro-NASA Nov 4, 2014
8978e17
Adding swig install
miatauro-NASA Nov 4, 2014
1407615
Adding verbosity while figuring out Travis builds
miatauro-NASA Nov 4, 2014
18a4e53
Bumping CMake version back up, since there's a required feature; addi…
miatauro-NASA Nov 4, 2014
e362bf3
Moving cmake up in priority to see if that'll do the job
miatauro-NASA Nov 4, 2014
2296b16
Forgot to add the update
miatauro-NASA Nov 4, 2014
2ee6451
More fixes for building on Travis. Hopefully Java will get generated…
miatauro-NASA Nov 7, 2014
9f3ca9d
Integrating changes from the remote
miatauro-NASA Nov 7, 2014
6769542
Fixing JNI include location on OS X (possibly this should be Java-ver…
miatauro-NASA Nov 11, 2014
6e97f1d
Trying to fix SWIG output directory creation
miatauro-NASA Nov 11, 2014
e2a41cb
Hopefully the last changes to get Europa building on Travis
miatauro-NASA Nov 14, 2014
33fb71d
Removing verbosity and adding test running to the build
miatauro-NASA Nov 15, 2014
08c605b
Merge pull request #1 from jubalh/master
miatauro-NASA Nov 15, 2014
73c1214
Bumping up the verbosity of testing to get more info on Travis
miatauro-NASA Nov 15, 2014
fc937fa
Add failure-on-exception to constraint engine tests
miatauro-NASA Nov 15, 2014
9201468
merging from remote
miatauro-NASA Nov 15, 2014
65a4d28
Resolving small conflict in comments
miatauro-NASA Dec 4, 2014
9818781
Changes to make CE tests pass.
miatauro-NASA Dec 4, 2014
69ba98b
Adding registration of "Random" variable handler. Fixes issue #161.
miatauro-NASA Dec 4, 2014
560e15e
Added tests for Domain::lt, Domain::eq, and Domain:::leq, per the
miatauro-NASA Dec 5, 2014
b929d93
More tests which stubbornly refuse to fail.
miatauro-NASA Dec 5, 2014
222d4d5
Adding the GitHub README, trying to fix some issues found by Coverity.
miatauro-NASA Dec 5, 2014
21f7bf6
Adding Travis CI autobuild badge
miatauro-NASA Dec 5, 2014
bd07bb0
Adding Coverity badge
miatauro-NASA Dec 5, 2014
a4b2220
Moving the coverity badge
miatauro-NASA Dec 5, 2014
f99cdd1
Trying to fix links in README
miatauro-NASA Dec 5, 2014
9403121
Fixing issues found by Coverity
miatauro-NASA Dec 7, 2014
62fd39d
Fixing issues found by clang's -Weverything
miatauro-NASA Dec 7, 2014
da0ada7
Fixing macro vararg warnings. Should be more standards-compliant now.
miatauro-NASA Dec 7, 2014
53cf9ad
Code cleanups for clang's -Weverything
miatauro-NASA Dec 7, 2014
a5c3948
Got the assert macro backwards
miatauro-NASA Dec 7, 2014
ecc9c07
Fixing solver test that never ran
miatauro-NASA Dec 8, 2014
c56c2f2
Part-way through fixing compilation warnings
miatauro-NASA Dec 13, 2014
0a11119
Removed all Id references. Many cleanups for code warnings. Code
miatauro-NASA Dec 14, 2014
eca5c8c
Fixes for tests broken by the Great Id Reference Cleanup
miatauro-NASA Dec 18, 2014
aaca80c
Fixing a reference to UINT_MAX
miatauro-NASA Dec 19, 2014
aee5c29
Fixes for compile warnings under g++ (had previously only used clang++)
miatauro-NASA Dec 20, 2014
03887b5
First round of #include cleanups, Utils module
miatauro-NASA Dec 21, 2014
58d6283
First round of #include cleanups, ConstraintEngine module
miatauro-NASA Dec 21, 2014
b568366
Further header cleanups, and work to fix in-source NDDL3 generation and
miatauro-NASA Dec 26, 2014
7160aae
Plan database header cleanup
miatauro-NASA Dec 28, 2014
a0b234c
Adding optimized build to the autobuild
miatauro-NASA Dec 28, 2014
263e4cd
Fixing problems with adding optimized build
miatauro-NASA Dec 28, 2014
7804498
More fixes for things found by Coverity
miatauro-NASA Dec 30, 2014
6c97a9e
Removing duplicate constraint registration to address issue 10
miatauro-NASA Jan 3, 2015
68bc38b
Merge branch 'master' of https://github.com/nasa/europa
miatauro-NASA Jan 3, 2015
562b940
Re-adding plan comparison, currently only using diff
miatauro-NASA Jan 4, 2015
3b5d3c9
Adding (slightly) more sophisticated plan diff and the ability to turn
miatauro-NASA Jan 6, 2015
b1f56c5
Adding coverage via coveralls
miatauro-NASA Jan 6, 2015
4806690
Trying to fix the new Travis build
miatauro-NASA Jan 6, 2015
7b4b87f
Fixed typo in error message
miatauro-NASA Jan 7, 2015
7ca98c8
Added coveralls badge and trying just always running coveralls
miatauro-NASA Jan 7, 2015
8057e31
Another try at always running coveralls
miatauro-NASA Jan 7, 2015
16e83b2
Addressing issue #9
miatauro-NASA Feb 6, 2015
93d92ae
Removing verbose testing and fixing wiki links in the readme
miatauro-NASA Feb 8, 2015
2f7a69d
Adding eqUnion constraint to address issue 42
miatauro-NASA Feb 21, 2015
f30c69d
Removed % operator on edouble and added std::fmod overload for issue 148
miatauro-NASA Feb 21, 2015
39bd6b9
Fixed small cmake bug in plan-and-compare.cmake
miatauro-NASA Feb 22, 2015
7af6a2c
Adding the ability to cast LabelStrs to std::strings. First step in
miatauro-NASA Feb 23, 2015
7d38e6b
Checkpoint during LabelStr reduction
miatauro-NASA Feb 24, 2015
181a6a3
Second checkpoint during LabelStr reduction
miatauro-NASA Feb 24, 2015
be26ec8
Third LabelStr reduction checkpoint
miatauro-NASA Feb 24, 2015
cb4a00b
Fourth LabelStr reduction checkpoint
miatauro-NASA Feb 24, 2015
908dfb8
Fifth LabelStr reduction checkpoint
miatauro-NASA Feb 24, 2015
f35eb53
Sixth LabelStr reduction checkpoint.
miatauro-NASA Feb 24, 2015
f0f9295
Seventh LabelStr reduction checkpoint
miatauro-NASA Feb 24, 2015
ab0b06c
Eighth LabelStr reduction checkpoint. All maps using edouble/LabelStr
miatauro-NASA Feb 25, 2015
4d1c36e
Ninth LabelStr reduction checkpoint. Restricting LabelStrs to domain…
miatauro-NASA Feb 25, 2015
4c7bd88
Tenth LabelStr reduction checkpoint. NDDL.
miatauro-NASA Feb 26, 2015
abbe719
Eleventh LabelStr reduction checkpoint. PlanDatabase. This is also
miatauro-NASA Feb 27, 2015
2d7c5c1
Twelfth Night. I mean LabelStr reduction checkpoint. Resource.
miatauro-NASA Feb 27, 2015
8921063
Thirteenth LabelStr reduction checkpoint. RulesEngine.
miatauro-NASA Feb 27, 2015
1770db0
Fourteenth LabelStr reduction checkpoint. Solvers.
miatauro-NASA Feb 27, 2015
4c75905
Fifteenth LabelStr reduction checkpoint. System and TNet.
miatauro-NASA Feb 27, 2015
1962a7d
Sixteenth LabelStr reduction checkpoint. Utils. All done!
miatauro-NASA Feb 27, 2015
6dc9e6d
More sophisticated test for issue 74. Still can't reproduce it.
miatauro-NASA Feb 27, 2015
6b7c663
Even more attempts to reproduce issue 74. I suspect this is well and
miatauro-NASA Feb 27, 2015
4ebca52
Added known-good file for constraint-to-temporal test. Removed several
miatauro-NASA Feb 27, 2015
71d428b
Removing checkreqs per issue 122
miatauro-NASA Feb 27, 2015
6582a4d
Adding the ability to allow (or disallow) violations in the config file
miatauro-NASA Feb 27, 2015
bc0a6e3
Missed small change in PSEngine.i
miatauro-NASA Mar 1, 2015
e85faa1
First checkpoint, removing Id from TemporalNetwork. Tests fail outside
miatauro-NASA Mar 10, 2015
513c802
Fixed tests. Still need to add smart pointers.
miatauro-NASA Mar 10, 2015
a3c2476
Adding some smart pointers to the temporal network, getting rid of
miatauro-NASA Mar 23, 2015
2a39a80
More shared pointers in the temporal network.
miatauro-NASA Mar 23, 2015
2a93447
TemporalConstraintId is now a smart pointer
miatauro-NASA Mar 27, 2015
63e2c96
Removing null checks before delete (addresses issue 169)
miatauro-NASA Mar 27, 2015
048c806
Fixed Learn More Link
walshie4 May 9, 2015
3a4d66e
Merge pull request #171 from walshie4/master
miatauro-NASA May 11, 2015
9413f8b
NDDL3Tree: fixed copy/paste error
Feb 10, 2016
84c21ce
Merge pull request #173 from tssch/master
miatauro-NASA Feb 10, 2016
d92736b
Adding circle.yml to install jam as a dependency
adityai May 2, 2016
f36909d
Adding libantlr3c-dev to circle.yml as a dependency
adityai May 2, 2016
4ffaa16
Added libantlr3c-3.2.0 and libcppunit to circle.yml
adityai May 2, 2016
606a784
Added other required packages to circle.yml
adityai May 2, 2016
f0f5e2f
Fixed circle.yml
adityai May 2, 2016
62b011b
Update circle.yml
adityai May 2, 2016
c23c643
Update circle.yml
adityai May 2, 2016
3fd2525
Update circle.yml
adityai May 2, 2016
b6ab64d
Copied .travis.yml to circle.yml to try cmake build.
adityai May 2, 2016
2037888
Combining sudo apt-get from travis into circle.
adityai May 2, 2016
c6e1a96
Update circle.yml
adityai May 2, 2016
0f9b59e
Update circle.yml
adityai May 2, 2016
a910291
Added coverage value 1 and optimize value 0 in circle.yml for cmake.
adityai May 2, 2016
0602bbe
Removing coveralls command.
adityai May 2, 2016
bea3523
Update circle.yml
adityai May 3, 2016
d184cd6
Removing ctests command from circle.yml
adityai May 3, 2016
79eec90
Adding ctest command back into circle.yml
adityai May 3, 2016
3d2557b
Trying to override ant build
adityai May 19, 2016
8a2eaed
Added - before ant init
adityai May 19, 2016
995a867
Deleting build.xml
adityai May 19, 2016
f91ebc4
Removed override ant
adityai May 19, 2016
70d625d
Test section added
adityai May 19, 2016
d8c8bcd
Preceded ctest with cd build
adityai May 19, 2016
3c8160f
Removed trailing blank lines
adityai May 19, 2016
3730ca9
Archiving europa and copying to $CIRCLE_ARTIFACTS
adityai May 20, 2016
e6042b9
white space to trigger circleci build
adityai Oct 31, 2016
75b555f
Added antlr
adityai Nov 9, 2016
0eb2c91
Removed antlr from sudo apt-get install line.
adityai Nov 9, 2016
0b6a44f
Added just antlr to sudo apt-get install.
adityai Nov 10, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ src/PLASMA/TinyXml/test/textfile.txt
src/PLASMA/Utils/test/writeTest.xml
src/Java/PSEngine/generated/*
\#*#
PSEngineAdditionalClasses
17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
language: cpp
compiler:
- gcc
- clang
env:
- OPTIMIZE=0 COVERAGE=0
- OPTIMIZE=1 COVERAGE=0
- OPTIMIZE=0 COVERAGE=1
matrix:
exclude:
- compiler: clang
env: OPTIMIZE=0 COVERAGE=1
before_install: sudo pip install cpp-coveralls
install: sudo add-apt-repository --yes ppa:kalakris/cmake && sudo apt-get update -qq && sudo apt-get install cmake libboost-dev libcppunit-dev libantlr3c-dev antlr swig
script: mkdir build && cd build && cmake -DOPTIMIZE=$OPTIMIZE -DCOVERAGE=$COVERAGE .. && make -j2 && ctest
after_success:
- coveralls --gcov-options '\-lp'
43 changes: 37 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,42 @@
cmake_minimum_required(VERSION 2.6)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
cmake_policy(SET CMP0042 OLD) #TODO: figure out what this means
endif(COMMAND cmake_policy)
cmake_minimum_required(VERSION 2.8.8)
if((CMAKE_MAJOR_VERSION GREATER 3) OR (CMAKE_MAJOR_VERSION EQUAL 3))
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
cmake_policy(SET CMP0042 OLD) #TODO: figure out what this means
endif(COMMAND cmake_policy)
endif((CMAKE_MAJOR_VERSION GREATER 3) OR (CMAKE_MAJOR_VERSION EQUAL 3))

set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
project(Europa2 C CXX Java)
add_definitions(-DTIXML_USE_STL=1)
enable_testing()
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
#Options to support:
# * optimized/not
option(OPTIMIZE "Build optimized" FALSE)
# * shared/not
option(SHARED "Build shared libraries" TRUE)
set(BUILD_SHARED_LIBS ${SHARED})
add_subdirectory(src)
# * 64/32-bit
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(SIXTYFOUR TRUE)
endif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
option(SIXTYFOUR "Build for 64-bit" ${SIXTYFOUR})
# * modules?
# * coverage
option(COVERAGE "Build with coverage info" FALSE)

set(EUROPA_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
set(CppUnit_FIND_QUIETLY TRUE)

if(OPTIMIZE)
set(EUROPA_SUFFIX "_o")
else()
set(EUROPA_SUFFIX "_g")
endif(OPTIMIZE)

add_subdirectory(src)
install(EXPORT Europa2 DESTINATION ${EUROPA_ROOT}/dist/europa)
install(DIRECTORY ${EUROPA_ROOT}/bin DESTINATION ${EUROPA_ROOT}/dist/europa)
install(DIRECTORY ${EUROPA_ROOT}/config DESTINATION ${EUROPA_ROOT}/dist/europa)
install(DIRECTORY ${EUROPA_ROOT}/bin/.makeproject DESTINATION ${EUROPA_ROOT}/dist/bin)
29 changes: 29 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# EUROPA

[![Build Status](https://travis-ci.org/nasa/europa.svg?branch=master)](https://travis-ci.org/nasa/europa) <a href="https://scan.coverity.com/projects/3615">
<img alt="Coverity Scan Build Status"
src="https://scan.coverity.com/projects/3615/badge.svg"/>
</a>
[![Coverage Status](https://coveralls.io/repos/nasa/europa/badge.png)](https://coveralls.io/r/nasa/europa)

**EUROPA is available under [NASA's Open Source Agreement (NOSA) ](http://opensource.arc.nasa.gov/page/nosa-software-agreement)**

Welcome! EUROPA is a framework to model and tackle problems in Planning, Scheduling and Constraint Programming. EUROPA is typically embedded in a host application. It is designed to be expressive, efficient, extendable and configurable. It includes:

- **A Plan Database:** The technology cornerstone of EUROPA for storage and manipulation of plans as they are initialized and refined. The EUROPA Plan Database integrates a rich representation for actions, states, objects and constraints with powerful algorithms for automated reasoning, propagation, querying and manipulation.
- **A Problem Solver:** A core solver to automatically find and fix flaws in the plan database. It can be configured to plan, schedule or both. It can be easily customized to integrate specialized heuristics and resolution operations.
- **A Tool Box:** Europa includes a debugger for instrumentation and visualization of applications. It also includes a very high-level, declarative modeling language for describing problem domains and partial-plans.

[Learn more...](//github.com/nasa/europa/wiki/What-Is-Europa)

EUROPA was developed at NASA's Ames Research Center and is available under NASA's open source agreement [(NOSA)](http://opensource.arc.nasa.gov/page/nosa-software-agreement)

|**Getting Started**|**Documentation**|**Development**|
|-------------------|-----------------|---------------|
|[Download](https://github.com/nasa/europa/wiki/Europa-Download)|[Background/Overview](https://github.com/nasa/europa/wiki/Europa-Background)|[Building EUROPA](https://github.com/nasa/europa/wiki/Building-Europa)|
|[Installation](https://github.com/nasa/europa/wiki/Europa-Installation)|[User Documentation](https://github.com/nasa/europa/wiki/Europa-Docs)|[Automated Builds](https://github.com/nasa/europa/wiki/Nightly-Builds)|
|[Quick Start](https://github.com/nasa/europa/wiki/Quick-Start)|[Examples](https://github.com/nasa/europa/wiki/Europa-Examples)|[Developer Notes](https://github.com/nasa/europa/wiki/Misc-Development)|
||[Publications](https://github.com/nasa/europa/wiki/Europa-Publications)|[Product Roadmap](https://github.com/nasa/europa/wiki/Europa-Roadmap)|
|||[People](https://github.com/nasa/europa/wiki/Europa-Team)|

For questions, please use the [europa-users](http://groups.google.com/group/europa-users) google group.
72 changes: 72 additions & 0 deletions bin/.makeproject/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
cmake_minimum_required(VERSION 2.8.8)
set(PROJECT %%Project%%)

project(${PROJECT})
include($ENV{EUROPA_HOME}/Europa2.cmake)

if(${APPLE})
set(JNI_INCLUDE_DIRS /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers)
else(${APPLE})
find_package(JNI REQUIRED)
endif(${APPLE})
include_directories(${JNI_INCLUDE_DIRS})

if(OPTIMIZE)
set(EUROPA_SUFFIX "_o")
else()
set(EUROPA_SUFFIX "_g")
endif(OPTIMIZE)

file(GLOB children RELATIVE $ENV{EUROPA_HOME} $ENV{EUROPA_HOME}/*)
foreach(child ${children})
if(IS_DIRECTORY $ENV{EUROPA_HOME}/${child})
include_directories($ENV{EUROPA_HOME}/${child})
include_directories($ENV{EUROPA_HOME}/${child}/base)
include_directories($ENV{EUROPA_HOME}/${child}/component)
endif(IS_DIRECTORY $ENV{EUROPA_HOME}/${child})
endforeach(child)

#project-swig
find_package(SWIG REQUIRED)
include(${SWIG_USE_FILE})
set(CMAKE_SWIG_OUTDIR ${CMAKE_SOURCE_DIR})
set_source_files_properties(${PROJECT}.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties(${PROJECT}.i PROPERTIES SWIG_FLAGS "-package;psengine;-includeall")
swig_add_module(${PROJECT} java ${PROJECT}.i)


#project-lib
add_library(${PROJECT}${EUROPA_SUFFIX} ${swig_generated_file_fullname} ${PROJECT}CustomCode.cc Module${PROJECT}.cc)


#project-rt
add_executable(${PROJECT}-planner${EUROPA_SUFFIX}_rt ${PROJECT}-Main.cc ${PROJECT}CustomCode.cc Module${PROJECT}.cc)
target_link_libraries(${PROJECT}-planner${EUROPA_SUFFIX}_rt System${EUROPA_SUFFIX} Resource${EUROPA_SUFFIX} Solvers${EUROPA_SUFFIX} NDDL${EUROPA_SUFFIX} TemporalNetwork${EUROPA_SUFFIX} RulesEngine${EUROPA_SUFFIX} ConstraintEngine${EUROPA_SUFFIX} Utils${EUROPA_SUFFIX} TinyXml${EUROPA_SUFFIX})

#run-project
add_custom_target(run-project
DEPENDS ${PROJECT}-planner${EUROPA_SUFFIX}_rt
COMMAND ./${PROJECT}-planner${EUROPA_SUFFIX}_rt ${PROJECT}-initial-state.nddl PlannerConfig.xml > RUN_${PROJECT}-planner${EUROPA_SUFFIX}_rt.${PROJECT}-initial-state.nddl.PlannerConfig.xml.output)

#project_jar
find_package(Java REQUIRED)
include(UseJava RESULT_VARIABLE java_included)
if(NOT java_included)
message(FATAL_ERROR "Failed to include UseJava")
endif(NOT java_included)

#find_jar(europa_jar PSEngine.jar PATHS $ENV{EUROPA_HOME})
add_jar(${PROJECT}Jar
SOURCES
${PROJECT}.java
${PROJECT}JNI.java
${CMAKE_CURRENT_SOURCE_DIR}/java/${PROJECT}/Main.java
INCLUDE_JARS
$ENV{EUROPA_HOME}/PSEngine.jar
$ENV{EUROPA_HOME}/PSUISwing.jar
OUTPUT_NAME ${PROJECT}
ENTRY_POINT ${PROJECT}/Main
)

add_dependencies(${PROJECT}Jar ${PROJECT}${EUROPA_SUFFIX})

4 changes: 2 additions & 2 deletions bin/.makeproject/ModuleTemplate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ namespace EUROPA {
// static C init method to get handle when loading module as shared library
extern "C"
{
ModuleId initializeModule()
Module* initializeModule()
{
return (new Module%%Project%%())->getId();
return (new Module%%Project%%());
}
}

Expand Down
12 changes: 8 additions & 4 deletions bin/.makeproject/Template-Main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ bool solve(const char* plannerConfig,

PSEngine* engine = PSEngine::makeInstance();
engine->start();
#ifndef USE_EUROPA_DLL
engine->addModule((new Module%%Project%%()));
#endif
engine->executeScript("nddl",nddlFile,true/*isFile*/);
#ifndef USE_EUROPA_DLL
engine->addModule((new Module%%Project%%()));
#endif
std::string errors = engine->executeScript("nddl",nddlFile,true/*isFile*/);
if(!errors.empty()) {
std::cout << errors << std::endl;
return false;
}

PSSolver* solver = engine->createSolver(plannerConfig);
runSolver(solver,startHorizon,endHorizon,maxSteps);
Expand Down
Loading