fix

designer_base/build.9.0.gradle

@@ -40,17 +40,17 @@ ant{
 	delete(dir:"src/main")
 	mkdir(dir:"src/main/java")
 	move(todir:"src/main/java"){
-		fileset(dir:"src/com")
+		fileset(dir:"src",includes:"com/**")
 	}
 }
 //指定源码路径
-sourceSets{
-	main{
-		java{
-			srcDirs=["${srcDir}/src"]
-		}
-	}
-}
+//sourceSets{
+//	main{
+//		java{
+//			srcDirs=["${srcDir}/src"]
+//		}
+//	}
+//}
 //获取什么分支名
 FileTree files =fileTree(dir:'./',include:'build.*.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
@@ -66,7 +66,7 @@ dependencies{
 //复制非.java文件到classes文件夹下参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		from ("${srcDir}/src"){
+		from ("${srcDir}/src/main/java"){
 			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
 		}
 		into 'build/classes/main'
@@ -83,7 +83,7 @@ task compressJS{
 		}
 	}
 	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
-		fileset (dir:"${srcDir}/src"){
+		fileset (dir:"${srcDir}/src/main/java"){
 			include (name:'**/*.js')
 			include (name:'**/*.css')
 		}

designer_base/build.9.0.gradle.bak

@@ -36,7 +36,13 @@ jar{
 
 def srcDir="."
 def baseDir=".."
-
+ant{
+	delete(dir:"src/main")
+	mkdir(dir:"src/main/java")
+	move(todir:"src/main/java"){
+		fileset(dir:"src",includes:"com/**")
+	}
+}
 //指定源码路径
 sourceSets{
 	main{
@@ -60,7 +66,7 @@ dependencies{
 //复制非.java文件到classes文件夹下参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		from ("${srcDir}/src"){
+		from ("${srcDir}/src/main/java"){
 			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
 		}
 		into 'build/classes/main'
@@ -77,7 +83,7 @@ task compressJS{
 		}
 	}
 	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
-		fileset (dir:"${srcDir}/src"){
+		fileset (dir:"${srcDir}/src/main/java"){
 			include (name:'**/*.js')
 			include (name:'**/*.css')
 		}

designer_chart/build.9.0.gradle

@@ -40,17 +40,17 @@ ant{
 	delete(dir:"src/main")
 	mkdir(dir:"src/main/java")
 	move(todir:"src/main/java"){
-		fileset(dir:"src/com")
+		fileset(dir:"src",includes:"com/**")
 	}
 }
 //指定源码路径
-sourceSets{
-	main{
-		java{
-			srcDirs=["${srcDir}/src"]
-		}
-	}
-}
+//sourceSets{
+//	main{
+//		java{
+//			srcDirs=["${srcDir}/src"]
+//		}
+//	}
+//}
 //获取什么分支名
 FileTree files =fileTree(dir:'./',include:'build.*.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
@@ -66,7 +66,7 @@ dependencies{
 //复制非.java文件到classes文件夹下参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		from ("${srcDir}/src"){
+		from ("${srcDir}/src/main/java"){
 			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
 		}
 		into 'build/classes/main'
@@ -83,7 +83,7 @@ task compressJS{
 		}
 	}
 	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
-		fileset (dir:"${srcDir}/src"){
+		fileset (dir:"${srcDir}/src/main/java"){
 			include (name:'**/*.js')
 			include (name:'**/*.css')
 		}

designer_chart/build.9.0.gradle.bak

@@ -36,15 +36,21 @@ jar{
 
 def srcDir="."
 def baseDir=".."
-
-//指定源码路径
-sourceSets{
-	main{
-		java{
-			srcDirs=["${srcDir}/src"]
-		}
+ant{
+	delete(dir:"src/main")
+	mkdir(dir:"src/main/java")
+	move(todir:"src/main/java"){
+		fileset(dir:"src",includes:"com/**")
 	}
 }
+//指定源码路径
+//sourceSets{
+//	main{
+//		java{
+//			srcDirs=["${srcDir}/src"]
+//		}
+//	}
+//}
 //获取什么分支名
 FileTree files =fileTree(dir:'./',include:'build.*.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))

designer_form/build.9.0.gradle

@@ -40,18 +40,19 @@ ant{
 	delete(dir:"src/main")
 	mkdir(dir:"src/main/java")
 	move(todir:"src/main/java"){
-		fileset(dir:"src/com")
+		fileset(dir:"../designer/src",includes:"com/**")
+		fileset(dir:"src",includes:"com/**")
 	}
 }
 //指定源码路径
-sourceSets{
-	main{
-		java{
-			srcDirs=["${srcDir}/src",
-				"${srcDir}/../designer/src"]
-		}
-	}
-}
+//sourceSets{
+//	main{
+//		java{
+//			srcDirs=["${srcDir}/src",
+//				"${srcDir}/../designer/src"]
+//		}
+//	}
+//}
 //获取什么分支名
 FileTree files =fileTree(dir:'./',include:'build.*.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
@@ -77,8 +78,8 @@ def dataContent ={def dir ->
 
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
-		with dataContent.call("${srcDir}/src") 
-		with dataContent.call("${srcDir}/../designer/src") 
+		with dataContent.call("${srcDir}/src/main/java") 
+	//	with dataContent.call("${srcDir}/../designer/src") 
 		into 'build/classes/main'
 	}
 
@@ -93,11 +94,7 @@ task compressJS{
 		}
 	}
 	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
-		fileset (dir:"${srcDir}/src"){
-			include (name:'**/*.js')
-			include (name:'**/*.css')
-		}
-		fileset (dir:"${srcDir}/../designer/src"){
+		fileset (dir:"${srcDir}/src/main/java"){
 			include (name:'**/*.js')
 			include (name:'**/*.css')
 		}

designer_form/build.9.0.gradle.bak

@@ -36,16 +36,23 @@ jar{
 
 def srcDir="."
 def baseDir=".."
-
-//指定源码路径
-sourceSets{
-	main{
-		java{
-			srcDirs=["${srcDir}/src",
-				"${srcDir}/../designer/src"]
-		}
+ant{
+	delete(dir:"src/main")
+	mkdir(dir:"src/main/java")
+	move(todir:"src/main/java"){
+		fileset(dir:"../designer/src",includes:"com/**")
+		fileset(dir:"src",includes:"com/**")
 	}
 }
+//指定源码路径
+//sourceSets{
+//	main{
+//		java{
+//			srcDirs=["${srcDir}/src",
+//				"${srcDir}/../designer/src"]
+//		}
+//	}
+//}
 //获取什么分支名
 FileTree files =fileTree(dir:'./',include:'build.*.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
@@ -87,11 +94,7 @@ task compressJS{
 		}
 	}
 	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
-		fileset (dir:"${srcDir}/src"){
-			include (name:'**/*.js')
-			include (name:'**/*.css')
-		}
-		fileset (dir:"${srcDir}/../designer/src"){
+		fileset (dir:"${srcDir}/src/main/java"){
 			include (name:'**/*.js')
 			include (name:'**/*.css')
 		}