svn commit: r1758102 - in /ofbiz/trunk: build.gradle common.gradle

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1758102 - in /ofbiz/trunk: build.gradle common.gradle

Taher Alkhateeb
Author: taher
Date: Sun Aug 28 11:02:53 2016
New Revision: 1758102

URL: http://svn.apache.org/viewvc?rev=1758102&view=rev
Log:
Add the themes as gradle sub-projects just like all other components - OFBIZ-7534

For some reason we completely forgot to add the themes as gradle sub projects.
The current implementation of gradle treats every component as a sub project
and all themes are ofbiz components, and as such should be sub projects as well.

Modified:
    ofbiz/trunk/build.gradle
    ofbiz/trunk/common.gradle

Modified: ofbiz/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1758102&r1=1758101&r2=1758102&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Sun Aug 28 11:02:53 2016
@@ -235,12 +235,13 @@ eclipse.classpath.file.whenMerged { clas
     }
     classpath.entries.removeAll { entry ->
         /* remove "src" entries in .classpath named:
-         *   /framework, /applications, /specialpurpose and /hot-deploy
+         *   /framework, /applications, /specialpurpose, /themes and /hot-deploy
          */
         entry.kind == 'src' &&
             entry.path ==~ /(\/+framework)$/ ||
             entry.path ==~ /(\/+applications)$/ ||
             entry.path ==~ /(\/+specialpurpose)$/ ||
+            entry.path ==~ /(\/+themes)$/ ||
             entry.path ==~ /(\/+hot-deploy)$/
     }
     getDirectoryInActiveComponentsIfExists('config').each { configDir ->

Modified: ofbiz/trunk/common.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.gradle?rev=1758102&r1=1758101&r2=1758102&view=diff
==============================================================================
--- ofbiz/trunk/common.gradle (original)
+++ ofbiz/trunk/common.gradle Sun Aug 28 11:02:53 2016
@@ -33,6 +33,9 @@ def iterateOverActiveComponents(applyFun
         applyFunction file("${rootDir}/specialpurpose/"+component.@"component-location")
     }
 
+    file("${rootDir}/themes").eachDir { component ->
+        applyFunction(component)
+    }
     file("${rootDir}/hot-deploy").eachDir { component ->
         applyFunction(component)
     }