From 99c05ac83888005a1aa3a1c31fe77d8ee5e36c42 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 21 Aug 2012 12:32:01 -0500
Subject: Updated CMake jar() function.

The jar() function has been modified to support multiple input dirs
in a single command. This way it's not necessary to define multiple
jar targets for the same jar file. The pki-console build script has
been updated to utilize this functionality.

Ticket #89
---
 base/console/src/CMakeLists.txt | 16 +++-----
 cmake/Modules/Java.cmake        | 83 +++++++++++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/base/console/src/CMakeLists.txt b/base/console/src/CMakeLists.txt
index dcd1db8f6..ee7c25b58 100644
--- a/base/console/src/CMakeLists.txt
+++ b/base/console/src/CMakeLists.txt
@@ -107,7 +107,7 @@ javac(pki-console-classes
         pki-common-classes
 )
 
-# package common and console classes
+# package common and console classes and resources
 jar(pki-console-jar
     CREATE
         ${CMAKE_BINARY_DIR}/dist/pki-console-${APPLICATION_VERSION}.jar
@@ -116,18 +116,12 @@ jar(pki-console-jar
     FILES
         com/netscape/admin/certsrv/*.class
         com/netscape/certsrv/common/*.class
-    DEPENDS
-        pki-console-classes pki-common-classes
-)
-
-# package console resources
-jar(pki-console-resources
-    UPDATE
-        ${CMAKE_BINARY_DIR}/dist/pki-console-${APPLICATION_VERSION}.jar
+    INPUT_DIR
+        ${CMAKE_CURRENT_SOURCE_DIR}
     FILES
         com/netscape/admin/certsrv/images/*.gif
     DEPENDS
-        pki-console-jar
+        pki-console-classes pki-common-classes
 )
 
 link(pki-console
@@ -136,7 +130,7 @@ link(pki-console
     DEST
         pki-console-${APPLICATION_VERSION}.jar
     DEPENDS
-        pki-console-resources
+        pki-console-jar
 )
 
 install(
diff --git a/cmake/Modules/Java.cmake b/cmake/Modules/Java.cmake
index 78f14a22a..b0e561a2c 100644
--- a/cmake/Modules/Java.cmake
+++ b/cmake/Modules/Java.cmake
@@ -91,7 +91,7 @@ endfunction(javac)
 
 function(jar target)
 
-    set(input_dir ${CMAKE_CURRENT_SOURCE_DIR})
+    set(size 0)
 
     foreach (arg ${ARGN})
 
@@ -103,49 +103,86 @@ function(jar target)
             set(param ${arg})
             set(operation "u")
 
-        elseif (arg MATCHES "(INPUT_DIR|FILES|EXCLUDE|DEPENDS)")
+        elseif (arg STREQUAL "EXTRACT")
+            set(param ${arg})
+            set(operation "x")
+
+        elseif (arg MATCHES "(OPTIONS|PARAMS|INPUT_DIR|FILES|EXCLUDE|DEPENDS)")
             set(param ${arg})
 
         else ()
 
-            if (param MATCHES "(CREATE|UPDATE)")
-                set(output ${arg})
+            if (param MATCHES "(CREATE|UPDATE|EXTRACT)")
+                set(options f)
+                set(params ${arg})
+
+            elseif (param STREQUAL "OPTIONS")
+                set(options ${options}${arg})
+
+            elseif (param STREQUAL "PARAMS")
+                set(params ${params} ${arg})
 
             elseif (param STREQUAL "INPUT_DIR")
-                set(input_dir ${arg})
+                set(counter ${size})
+                set(input_dir_${counter} ${arg})
+                math(EXPR size "${counter} + 1")
 
             elseif (param STREQUAL "FILES")
-                list(APPEND files ${arg})
+                if (NOT DEFINED counter)
+                    set(counter 0)
+                endif(NOT DEFINED counter)
+
+                list(APPEND files_${counter} ${arg})
 
             elseif (param STREQUAL "EXCLUDE")
-                list(APPEND exclude ${arg})
+                list(APPEND exclude_${counter} ${arg})
 
             elseif (param STREQUAL "DEPENDS")
                 list(APPEND depends ${arg})
 
-            endif(param MATCHES "(CREATE|UPDATE)")
+            endif(param MATCHES "(CREATE|UPDATE|EXTRACT)")
 
         endif(arg STREQUAL "CREATE")
 
     endforeach(arg)
 
-    set(file_list "${CMAKE_CURRENT_BINARY_DIR}/${target}.files")
-
     add_custom_target(${target} ALL DEPENDS ${depends})
 
-    add_custom_command(
-        TARGET ${target}
-        COMMAND ${CMAKE_COMMAND}
-            -Doutput=${file_list}
-            -Dinput_dir=${input_dir}
-            -Dfiles="${files}"
-            -Dexclude="${exclude}"
-            -P ${CMAKE_MODULE_PATH}/JavaFileList.cmake
-        COMMAND ${CMAKE_Java_ARCHIVE}
-            -${operation}f ${output}
-            -C ${input_dir} @${file_list}
-        WORKING_DIRECTORY ${input_dir}
-    )
+    foreach(i RANGE ${counter})
+
+        # by default use the current source dir
+        if (NOT DEFINED input_dir_${counter})
+            set(input_dir_${counter} ${CMAKE_CURRENT_SOURCE_DIR})
+        endif(NOT DEFINED input_dir_${counter})
+
+        # by default include all files
+        if (NOT DEFINED files_${i})
+            set(files_${i} "*")
+        endif(NOT DEFINED files_${i})
+
+        # if i == 0 do the original operation
+        # otherwise, do an update operation
+        if (${i} GREATER 0)
+            set(operation "u")
+        endif(${i} GREATER 0)
+
+        set(file_list_${i} "${CMAKE_CURRENT_BINARY_DIR}/${target}-${i}.files")
+
+        add_custom_command(
+            TARGET ${target}
+            COMMAND ${CMAKE_COMMAND}
+                -Doutput=${file_list_${i}}
+                -Dinput_dir=${input_dir_${i}}
+                -Dfiles="${files_${i}}"
+                -Dexclude="${exclude_${i}}"
+                -P ${CMAKE_MODULE_PATH}/JavaFileList.cmake
+            COMMAND ${CMAKE_Java_ARCHIVE}
+                -${operation}${options} ${params}
+                @${file_list_${i}}
+            WORKING_DIRECTORY ${input_dir_${i}}
+        )
+
+    endforeach(i RANGE ${counter})
 
 endfunction(jar)
 
-- 
cgit