Fixup source for pcml builds

Signed-off-by: Jesse Gorzinski <[email protected]>
IBM · Feb 5, 2024 · 98e74fa · 98e74fa
1 parent db15484
commit 98e74fa
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 41 deletions.
diff --git a/build/PCMLTask.java b/build/PCMLTask.java
@@ -44,12 +44,13 @@ public void setDestdir(File destDir)
  public void execute() throws BuildException
  {
  DirectoryScanner scanner = getDirectoryScanner(srcDir_);
+ System.out.println("Source directory is "+srcDir_);
  String[] f = scanner.getIncludedFiles();
 
  Java java = (Java)project.createTask("java");
  java.clearArgs();
  java.setClassname("com.ibm.as400.data.ProgramCallDocument");
- java.setClasspath(classpath_);
+
  java.setFork(true); // Otherwise JDK 1.4 throws NoClassDefFoundError on sun/reflect/SerializationConstructorAccessorImpl
  Commandline.Argument arg1 = java.createArg();
  arg1.setValue("-serialize");
@@ -62,9 +63,13 @@ public void execute() throws BuildException
  (dest.exists() && dest.lastModified() < source.lastModified()))
  {
  System.out.println("Processing "+f[i]);
+ System.out.println(" source: "+source.getAbsolutePath());
+ System.out.println(" dest: "+dest.getAbsolutePath());
 
  String name = f[i].replace('\\', '.').replace('/', '.');
  arg2.setValue(name);
+ Path classpath = new Path(getProject(), classpath_+";"+dest.getParentFile().getAbsolutePath());
+ java.setClasspath(classpath);
  java.execute();
 
  Move move = (Move)project.createTask("move");
@@ -73,6 +78,8 @@ public void execute() throws BuildException
  move.setFile(outfile);
  move.setTofile(dest);
  move.execute();
+ } else {
+ System.out.println("Not processing because source is unchanged: "+source);
  }
  }
  }

diff --git a/pom-dist.xml b/pom-dist.xml
@@ -317,9 +317,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}/com/ibm/as400/access"
- srcdir="${basedir}/pcml"
- includes="**/NetServer.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/access"
+ includes="NetServer.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -336,9 +336,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}/com/ibm/as400/resource"
- srcdir="${basedir}/pcml"
- includes="**/R*.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/resource"
+ includes="R*.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -355,9 +355,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java8/com/ibm/as400/access"
- srcdir="${basedir}/pcml"
- includes="**/NetServer.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/access"
+ includes="NetServer.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -374,9 +374,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java8/com/ibm/as400/resource"
- srcdir="${basedir}/pcml"
- includes="**/R*.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/resource"
+ includes="R*.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -393,9 +393,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java11/com/ibm/as400/access"
- srcdir="${basedir}/pcml"
- includes="**/NetServer.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/access"
+ includes="NetServer.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -412,9 +412,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java11/com/ibm/as400/resource"
- srcdir="${basedir}/pcml"
- includes="**/R*.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/resource"
+ includes="R*.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -431,9 +431,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_native/com/ibm/as400/access"
- srcdir="${basedir}/pcml"
- includes="**/NetServer.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/access"
+ includes="NetServer.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -450,9 +450,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_native/com/ibm/as400/resource"
- srcdir="${basedir}/pcml"
- includes="**/R*.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/resource"
+ includes="R*.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -469,9 +469,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java8_native/com/ibm/as400/access"
- srcdir="${basedir}/pcml"
- includes="**/NetServer.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/access"
+ includes="NetServer.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -488,9 +488,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java8_native/com/ibm/as400/resource"
- srcdir="${basedir}/pcml"
- includes="**/R*.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/resource"
+ includes="R*.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -507,9 +507,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java11_native/com/ibm/as400/access"
- srcdir="${basedir}/pcml"
- includes="**/NetServer.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/access"
+ includes="NetServer.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>
@@ -526,9 +526,9 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}_java11_native/com/ibm/as400/resource"
- srcdir="${basedir}/pcml"
- includes="**/R*.pcml"
- classpath="${project.build.outputDirectory}:${basedir}/pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/resource"
+ includes="R*.pcml"
+ classpath="${project.build.outputDirectory}"
  />
  </target>
  </configuration>

diff --git a/pom.xml b/pom.xml
@@ -119,8 +119,8 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}/com/ibm/as400/access"
- srcdir="${basedir}/pcml"
- includes="**/NetServer.pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/access"
+ includes="NetServer.pcml"
  classpath="${project.build.outputDirectory}:${basedir}/pcml"
  />
  </target>
@@ -138,8 +138,8 @@
  <taskdef name="pcml" classname="PCMLTask" classpath="${project.build.outputDirectory}_ant" />
  <pcml
  destdir="${project.build.outputDirectory}/com/ibm/as400/resource"
- srcdir="${basedir}/pcml"
- includes="**/R*.pcml"
+ srcdir="${basedir}/src/main/resources/com/ibm/as400/resource"
+ includes="R*.pcml"
  classpath="${project.build.outputDirectory}:${basedir}/pcml"
  />
  </target>