LPS-17242

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@80549 05bdf26c-840f-0410-9ced-eb539d925f36
xieh · May 13, 2011 · fd4692e · fd4692e
1 parent de79c4b
commit fd4692e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/build-dist.xml b/build-dist.xml
@@ -567,18 +567,6 @@ app.server.glassfish.zip.url=http://download.java.net/glassfish/v3/release/${app
 
 		<delete dir="${lp.plugins.dir}/dist" />
 
-		<ant dir="${lp.plugins.dir}/hooks/sevencogs-hook" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/portlets/chat-portlet" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/portlets/google-maps-portlet" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/portlets/mail-portlet" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/portlets/opensocial-portlet" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/portlets/social-networking-portlet" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/portlets/web-form-portlet" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/portlets/wsrp-portlet" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/themes/sevencogs-mobile-theme" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/themes/sevencogs-theme" target="all" inheritAll="false" />
-		<ant dir="${lp.plugins.dir}/webs/kaleo-web" target="all" inheritAll="false" />
-
 		<delete dir="${liferay.home}/data" />
 		<delete dir="${liferay.home}/deploy" />
 
@@ -595,6 +583,10 @@ app.server.glassfish.zip.url=http://download.java.net/glassfish/v3/release/${app
 
 		<antcall target="zip-portal-war" />
 
+		<echo file="${lp.plugins.dir}/build.${user.name}.properties">plugins.includes=${lp.plugins.normal}</echo>
+
+		<ant dir="${lp.plugins.dir}" target="all" inheritAll="false" />
+
 		<antcall target="build-dist-geronimo" />
 		<antcall target="build-dist-glassfish" />
 		<antcall target="build-dist-jboss" />

diff --git a/release.properties b/release.properties
@@ -32,6 +32,7 @@
 ##
 
     lp.plugins.dir=${project.dir}/../../plugins/build
+    lp.plugins.normal=sevencogs-hook,chat-portlet,google-maps-portlet,mail-portlet,opensocial-portlet,social-networking-portlet,web-form-portlet,wsrp-portlet,sevencogs-mobile-theme,sevencogs-theme,kaleo-web
 
 ##
 ## Release Info
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ @@
     ##
         lp.plugins.dir=${project.dir}/../../plugins/build
+        lp.plugins.normal=sevencogs-hook,chat-portlet,google-maps-portlet,mail-portlet,opensocial-portlet,social-networking-portlet,web-form-portlet,wsrp-portlet,sevencogs-mobile-theme,sevencogs-theme,kaleo-web
     ##
     ## Release Info
@@ Expand Down @@