Changeset 7731
- Timestamp:
- 08/03/11 11:13:58 (8 years ago)
- Location:
- trunk/projects/jar2lib/src/main/resources
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/projects/jar2lib/src/main/resources/CMakeLists.vm
r7727 r7731 46 46 endif(NOT DEFINED Jar2Lib_JACE_DIR) 47 47 48 if(NOT DEFINED Jar2Lib_PROXY_DIR) 49 set(Jar2Lib_PROXY_DIR ../proxies) 50 endif(NOT DEFINED Jar2Lib_PROXY_DIR) 51 52 if(NOT DEFINED Jar2Lib_INCLDE_DIR) 53 set(Jar2Lib_INCLDE_DIR ../include) 54 endif(NOT DEFINED Jar2Lib_INCLDE_DIR) 55 56 if(NOT DEFINED Jar2Lib_DEPS_DIR) 57 set(Jar2Lib_DEPS_DIR jar) 58 endif(NOT DEFINED Jar2Lib_DEPS_DIR) 59 48 60 if(NOT DEFINED Jar2Lib_DIST_DIR) 49 61 set(Jar2Lib_DIST_DIR dist/${projectId}) 50 62 endif(NOT DEFINED Jar2Lib_DIST_DIR) 63 64 if(NOT DEFINED Jar2Lib_DEPS_SRC) 65 set(Jar2Lib_DEPS_SRC ../../dependency) 66 endif(NOT DEFINED Jar2Lib_DEPS_SRC) 51 67 52 68 if(NOT DEFINED J2L_BUILD_TYPE) … … 150 166 install(FILES 151 167 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${J2L_LIB_PREFIX}jace${J2L_JNI_SUFFIX}" 152 DESTINATION " ${Jar2Lib_DIST_DIR}"168 DESTINATION "." 153 169 ) 154 170 … … 164 180 install(FILES 165 181 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${J2L_LIB_PREFIX}jace${J2L_SUFFIX}" 166 DESTINATION " ${Jar2Lib_DIST_DIR}"182 DESTINATION "." 167 183 ) 168 184 endif(APPLE) … … 180 196 install(FILES 181 197 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${J2L_LIB_PREFIX}jace${J2L_SUFFIX}" 182 DESTINATION " ${Jar2Lib_DIST_DIR}"198 DESTINATION "." 183 199 ) 184 200 … … 193 209 VERBATIM 194 210 ) 195 install(FILES196 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${J2L_LIB_PREFIX}${projectId}${J2L_SUFFIX}"197 DESTINATION "${Jar2Lib_DIST_DIR}"198 )199 211 200 212 #copy jtools … … 208 220 VERBATIM 209 221 ) 222 223 # copy jace_runtime.jar 224 add_custom_command( 225 TARGET ${projectId} 226 DEPENDS "${CMAKE_BINARY_DIR}/../jace-runtime.jar" 227 POST_BUILD 228 COMMAND ${CMAKE_COMMAND} -E copy 229 "${CMAKE_BINARY_DIR}/../jace-runtime.jar" 230 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${Jar2Lib_DEPS_DIR}/jace-runtime.jar" 231 VERBATIM 232 ) 210 233 install(FILES 211 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${J2L_LIB_PREFIX}jtools${J2L_SUFFIX}" 212 DESTINATION "${Jar2Lib_DIST_DIR}" 213 ) 214 215 # copy jace_runtime.jar 216 add_custom_command( 217 TARGET ${projectId} 218 DEPENDS "${CMAKE_BINARY_DIR}/../jace-runtime.jar" 219 POST_BUILD 220 COMMAND ${CMAKE_COMMAND} -E copy 221 "${CMAKE_BINARY_DIR}/../jace-runtime.jar" 222 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/jace-runtime.jar" 223 VERBATIM 224 ) 225 install(FILES 226 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/jace-runtime.jar" 227 DESTINATION "${Jar2Lib_DIST_DIR}" 234 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${Jar2Lib_DEPS_DIR}/jace-runtime.jar" 235 DESTINATION "./${Jar2Lib_DEPS_DIR}" 228 236 ) 229 237 … … 237 245 COMMAND ${CMAKE_COMMAND} -E copy 238 246 "${jarFile}" 239 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${ jarName}"247 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${Jar2Lib_DEPS_DIR}/${jarName}" 240 248 VERBATIM 241 249 ) 242 250 install(FILES 243 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${ jarName}"244 DESTINATION " ${Jar2Lib_DIST_DIR}"251 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${Jar2Lib_DEPS_DIR}/${jarName}" 252 DESTINATION "./${Jar2Lib_DEPS_DIR}/" 245 253 ) 246 254 247 255 #end##foreach $sourceJars 256 257 # copy and install executables 258 #foreach ($sourceFile in $sourceFiles) 259 #set ($execName = $q.simpleName($sourceFile)) 260 #set ($sourceName = $sourceFile.getName()) 261 add_custom_command( 262 TARGET ${execName} 263 DEPENDS "${CMAKE_BINARY_DIR}/${execName}" 264 POST_BUILD 265 COMMAND ${CMAKE_COMMAND} -E copy 266 "${CMAKE_BINARY_DIR}/${execName}" 267 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${execName}" 268 VERBATIM 269 ) 270 #end##foreach $sourceFile 271 272 # copy and install dependencies 273 add_custom_command( 274 TARGET ${projectId} 275 DEPENDS "${CMAKE_BINARY_DIR}/${Jar2Lib_DEPS_SRC}" 276 POST_BUILD 277 COMMAND ${CMAKE_COMMAND} -E copy_directory 278 "${CMAKE_BINARY_DIR}/${Jar2Lib_DEPS_SRC}" 279 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${Jar2Lib_DEPS_DIR}/" 280 VERBATIM 281 ) 282 283 install(DIRECTORY 284 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${Jar2Lib_DEPS_DIR}/" 285 DESTINATION "./${Jar2Lib_DEPS_DIR}/" 286 ) 287 288 # copy dependency headers 289 add_custom_command( 290 TARGET ${projectId} 291 DEPENDS "${Jar2Lib_INCLDE_DIR}" 292 COMMAND ${CMAKE_COMMAND} -E copy_directory 293 "${Jar2Lib_INCLDE_DIR}" 294 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/include" 295 VERBATIM 296 ) 297 298 # copy and install proxies 299 add_custom_command( 300 TARGET ${projectId} 301 DEPENDS "${CMAKE_BINARY_DIR}/${Jar2Lib_PROXY_DIR}" 302 POST_BUILD 303 COMMAND ${CMAKE_COMMAND} -E copy_directory 304 "${CMAKE_BINARY_DIR}/${Jar2Lib_PROXY_DIR}/include" 305 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/include" 306 VERBATIM 307 ) 308 309 install(DIRECTORY 310 "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/include/" 311 DESTINATION "./include" 312 ) 313 314 # install targets 315 install(TARGETS 316 jtools 317 ${projectId} 318 #foreach ($sourceFile in $sourceFiles) 319 #set ($execName = $q.simpleName($sourceFile)) 320 ${execName} 321 #end##foreach $sourceFile 322 RUNTIME DESTINATION . 323 LIBRARY DESTINATION . 324 ARCHIVE DESTINATION . 325 ) 248 326 249 327 SET(CPACK_PACKAGE_FILE_NAME "${projectId}") 250 328 SET(CPACK_GENERATOR "TGZ;ZIP") 251 329 INCLUDE( CPack ) 330 -
trunk/projects/jar2lib/src/main/resources/project-files/jtools/include/javaTools.h
r7718 r7731 40 40 41 41 #include <string> 42 #include <dirent.h> 42 43 #include <iostream> 43 44 #include "jace.h" -
trunk/projects/jar2lib/src/main/resources/project-files/jtools/source/javaTools.cxx
r7718 r7731 109 109 110 110 //TODO: Add option override java library path 111 /** 112 * jarlist is a semi-colon-separated list of additional jars to include 113 **/ 111 114 void JavaTools::createJVM(string classdir, string jarlist, bool headless, int memory) 112 115 { … … 126 129 std::string classpath (""); 127 130 128 //TODO: Add all Jar2Lib classpath jars to this list by default (by template? by txt file?)129 131 classpath += classdir + "jace-runtime.jar"; 132 133 DIR *d; 134 struct dirent *dir; 135 136 if(classdir.length() >= 1) 137 { 138 string tmp_dir(classdir); 139 tmp_dir += "jar"; 140 d = opendir(tmp_dir.c_str()); 141 } 142 else 143 { 144 d = opendir("./jar"); 145 } 146 147 if(d) 148 { 149 while ((dir = readdir(d)) != NULL) 150 { 151 string tmp_name(dir->d_name); 152 153 if(tmp_name.compare(".") != 0 && tmp_name.compare("..") !=0) 154 { 155 classpath += PATHSTEP; 156 classpath += classdir + "jar" + SLASH + dir->d_name; 157 } 158 } 159 160 closedir(d); 161 } 162 130 163 131 164 if(jarlist.length() >= 1) … … 147 180 } 148 181 149 std::cout << "jarlist : " << jarlist << std::endl; 150 151 std::cout << "Classpath for JVM: " << classpath << std::endl; 182 //std::cout << "jarlist : " << jarlist << std::endl; 183 //std::cout << "Classpath for JVM: " << classpath << std::endl; 152 184 153 185 list.push_back(jace::ClassPath(
Note: See TracChangeset
for help on using the changeset viewer.