Changeset 7629 for trunk/projects/cppwrap-maven-plugin

Timestamp:

02/21/11 22:07:28 (9 years ago)

Author:

curtis

Message:

Add separate settings for library vs. classpath JARs.

Library JARs are scanned, and their classes wrapped as C++ proxies,
whereas classpath JARs are added to the classpath but not wrapped.

With these changes, cppwrap can now successfully wrap projects with
dependencies.

File:

• trunk/projects/cppwrap-maven-plugin/src/main/java/loci/maven/plugin/cppwrap/CppWrapMojo.java (modified) (5 diffs)

trunk/projects/cppwrap-maven-plugin/src/main/java/loci/maven/plugin/cppwrap/CppWrapMojo.java

@@ -81 +81 @@
          *
          * @parameter expression="${cppwrap.headerFile}"
-         *   default-value="src/main/cppwrap/header.txt"
+         *   default-value="LICENSE.txt"
          */
         private File headerFile;
@@ -99 +99 @@
                 final String projectId = artifactId.replaceAll("[^\\w\\-]", "_");
                 final String projectName = project.getName();
-                final List<String> libraryPaths = getLibraryPaths();
+                final List<String> libraryJars = getLibraryJars();
+                final List<String> classpathJars = getClasspathJars();
                 final String conflictsPath = conflictsFile.exists() ?
                         conflictsFile.getPath() : null;
@@ -114 +115 @@
                 jar2lib.setProjectId(projectId);
                 jar2lib.setProjectName(projectName);
-                jar2lib.setLibraryPaths(libraryPaths);
+                jar2lib.setLibraryJars(libraryJars);
+                jar2lib.setClasspathJars(classpathJars);
                 jar2lib.setConflictsPath(conflictsPath);
                 jar2lib.setHeaderPath(headerPath);
@@ -129 +131 @@
         }
 
-        private List<String> getLibraryPaths() throws MojoExecutionException {
-                final List<String> libraryPaths = new ArrayList<String>();
+        private List<String> getLibraryJars() throws MojoExecutionException {
+                final List<String> jars = new ArrayList<String>();
 
                 // add project artifact
@@ -137 +139 @@
                         throw new MojoExecutionException("Must execute package target first.");
                 }
-                libraryPaths.add(projectArtifact.getPath());
+                jars.add(projectArtifact.getPath());
+
+                return jars;
+        }
+
+        private List<String> getClasspathJars() {
+                final List<String> jars = new ArrayList<String>();
 
                 // add project runtime dependencies
                 final List<Artifact> artifacts = project.getRuntimeArtifacts();
                 for (final Artifact classPathElement : artifacts) {
-                        libraryPaths.add(classPathElement.getFile().getPath());
+                        jars.add(classPathElement.getFile().getPath());
                 }
 
-                return libraryPaths;
+                return jars;
         }