Revision: 1300
Author: mcculls
Date: Thu Oct 21 12:10:16 2010
Log: Issue 552: (step 1) move core code to its own subdirectory
http://code.google.com/p/google-guice/source/detail?r=1300
Added:
/trunk/core
/trunk/core/src
/trunk/core/test
Deleted:
/trunk/src
/trunk/test
Modified:
/trunk/build.properties
/trunk/build.xml
/trunk/common.xml
/trunk/copy.sh
/trunk/guice.iml
=======================================
--- /trunk/build.properties Fri Sep 10 22:06:17 2010
+++ /trunk/build.properties Thu Oct 21 12:10:16 2010
@@ -1,6 +1,6 @@
lib.dir=lib
-src.dir=src
-test.dir=test
+src.dir=core/src
+test.dir=core/test
servlet.src.dir=extensions/servlet/src
spring.src.dir=extensions/spring/src
assistedinject.src.dir=extensions/assistedinject/src
=======================================
--- /trunk/build.xml Mon Oct 4 20:25:16 2010
+++ /trunk/build.xml Thu Oct 21 12:10:16 2010
@@ -107,7 +107,7 @@
docletpath="lib/build/doclava.jar"
bootclasspath="${javahome}/jre/lib/rt.jar"
maxmemory="512M">
- <fileset dir="src" defaultexcludes="yes">
+ <fileset dir="${src.dir}" defaultexcludes="yes">
<include name="com/google/**"/>
<exclude name="com/google/inject/internal/**"/>
</fileset>
=======================================
--- /trunk/common.xml Sun May 9 05:48:24 2010
+++ /trunk/common.xml Thu Oct 21 12:10:16 2010
@@ -105,7 +105,7 @@
description="Create a .jar file with sources">
<mkdir dir="${build.dir}"/>
<zip destfile="${build.dir}/${ant.project.name}-${version}-src.jar">
- <fileset dir="src"/>
+ <fileset dir="${src.dir}"/>
</zip>
</target>
=======================================
--- /trunk/copy.sh Wed Feb 4 22:04:18 2009
+++ /trunk/copy.sh Thu Oct 21 12:10:16 2010
@@ -3,8 +3,8 @@
client=/usr/local/google/clients/collect/google3
-srcdir=src/com/google/inject/internal
-testdir=test/com/google/inject/internal
+srcdir=core/src/com/google/inject/internal
+testdir=core/test/com/google/inject/internal
filter() {
sed 's/com.google.common.base.internal/com.google.inject.internal/' | \
@@ -51,4 +51,4 @@
copy $commonpath/collect/ForwardingMap.java $testdir
copy $commonpath/base/Preconditions.java $testdir
-chmod +w -R src test
+chmod +w -R $srcdir $testdir
=======================================
--- /trunk/guice.iml Sun Sep 27 19:51:24 2009
+++ /trunk/guice.iml Thu Oct 21 12:10:16 2010
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/core/src"
isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/core/test"
isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/classes" />
<excludeFolder url="file://$MODULE_DIR$/javadoc" />
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
