db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1834384 - in /db/derby/code/trunk: java/build/org/apache/derbyBuild/JarDriftTest.java tools/ant/properties/dirs.properties
Date Mon, 25 Jun 2018 23:19:49 GMT
Author: rhillegas
Date: Mon Jun 25 23:19:49 2018
New Revision: 1834384

URL: http://svn.apache.org/viewvc?rev=1834384&view=rev
Log:
DERBY-6945: Change names of root directories in the generated tree so that they match their
target modules; commit derby-6945-40-aa-generatedSource-dirNames.diff.

Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java
    db/derby/code/trunk/tools/ant/properties/dirs.properties

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java?rev=1834384&r1=1834383&r2=1834384&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java Mon Jun 25 23:19:49
2018
@@ -179,8 +179,8 @@ public class JarDriftTest {
         // sanity=[false|true] except for some header/timestamp info).
         String fs = File.separator;
         String sanityFileName = 
-                topOfTree + fs + "generated" + fs + "java" + fs + "shared" + fs + "org" +
fs +
-                "apache" + fs + "derby" + fs + "shared" + fs + "common" + fs +
+                topOfTree + fs + "generated" + fs + "java" + fs + "org.apache.derby.commons"
+ fs +
+                "org" + fs + "apache" + fs + "derby" + fs + "shared" + fs + "common" + fs
+
                 "sanity" + fs + "state.properties";
         File sanityFile = new File(sanityFileName);
         String sanityContents = readFile(sanityFile);

Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=1834384&r1=1834383&r2=1834384&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Mon Jun 25 23:19:49 2018
@@ -28,15 +28,27 @@ javacom.dir=${javasrc.dir}/${com.dir}
 functest.dir=${javacom.dir}/functionTests
 locales.dir=${javacom.dir}/locales
 #
+# Module names
+#
+module.name.client=org.apache.derby.client
+module.name.commons=org.apache.derby.commons
+module.name.engine=org.apache.derby.engine
+module.name.optionaltools=org.apache.derby.optionaltools
+module.name.runner=org.apache.derby.runner
+module.name.server=org.apache.derby.server
+module.name.tests=org.apache.derby.tests
+module.name.tools=org.apache.derby.tools
+
+#
 # Output dirs
 #
 class.dir=classes
 out.base=${basedir}
 generated.dir=${out.base}/generated
 generated.src.dir=${generated.dir}/java
-generated.src.engine.dir=${generated.src.dir}/engine
-generated.src.shared.dir=${generated.src.dir}/shared
-generated.src.tools.dir=${generated.src.dir}/tools
+generated.src.engine.dir=${generated.src.dir}/${module.name.engine}
+generated.src.shared.dir=${generated.src.dir}/${module.name.commons}
+generated.src.tools.dir=${generated.src.dir}/${module.name.tools}
 generated.bin.dir=${generated.dir}/bin
 generated.toursdb.dir=${generated.dir}/toursdb
 



Mime
View raw message