Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

fix

master
sunmondong 7 years ago
parent
0e15a58aa2
commit
dbae3fa420
6 changed files with 71 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      designer_base/build.9.0.gradle
  2. 12
      designer_base/build.9.0.gradle.bak
  3. 20
      designer_chart/build.9.0.gradle
  4. 20
      designer_chart/build.9.0.gradle.bak
  5. 29
      designer_form/build.9.0.gradle
  6. 29
      designer_form/build.9.0.gradle.bak

20
designer_base/build.9.0.gradle
Unescape View File

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

12
designer_base/build.9.0.gradle.bak
Unescape View File

@ -36,7 +36,13 @@ jar{
def srcDir="." def srcDir="."
def baseDir=".." def baseDir=".."
ant{
delete(dir:"src/main")
mkdir(dir:"src/main/java")
move(todir:"src/main/java"){
fileset(dir:"src",includes:"com/**")
}
}
//指定源码路径 //指定源码路径
sourceSets{ sourceSets{
main{ main{
@ -60,7 +66,7 @@ dependencies{
//复制非.java文件到classes文件夹下参与打包 //复制非.java文件到classes文件夹下参与打包
task copyFile(type:Copy,dependsOn:compileJava){ task copyFile(type:Copy,dependsOn:compileJava){
copy{ copy{
from ("${srcDir}/src"){ from ("${srcDir}/src/main/java"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
into 'build/classes/main' 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'){ 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:'**/*.js')
include (name:'**/*.css') include (name:'**/*.css')
} }

20
designer_chart/build.9.0.gradle
Unescape View File

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

20
designer_chart/build.9.0.gradle.bak
Unescape View File

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

29
designer_form/build.9.0.gradle
Unescape View File

@ -40,18 +40,19 @@ ant{
delete(dir:"src/main") delete(dir:"src/main")
mkdir(dir:"src/main/java") mkdir(dir:"src/main/java")
move(todir:"src/main/java"){ move(todir:"src/main/java"){
fileset(dir:"src/com") fileset(dir:"../designer/src",includes:"com/**")
fileset(dir:"src",includes:"com/**")
} }
} }
//指定源码路径 //指定源码路径
sourceSets{ //sourceSets{
main{ // main{
java{ // java{
srcDirs=["${srcDir}/src", // srcDirs=["${srcDir}/src",
"${srcDir}/../designer/src"] // "${srcDir}/../designer/src"]
} // }
} // }
} //}
//获取什么分支名 //获取什么分支名
FileTree files =fileTree(dir:'./',include:'build.*.gradle') FileTree files =fileTree(dir:'./',include:'build.*.gradle')
def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) 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){ task copyFile(type:Copy,dependsOn:compileJava){
copy{ copy{
with dataContent.call("${srcDir}/src") with dataContent.call("${srcDir}/src/main/java")
with dataContent.call("${srcDir}/../designer/src") // with dataContent.call("${srcDir}/../designer/src")
into 'build/classes/main' 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'){ 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')
}
fileset (dir:"${srcDir}/../designer/src"){
include (name:'**/*.js') include (name:'**/*.js')
include (name:'**/*.css') include (name:'**/*.css')
} }

29
designer_form/build.9.0.gradle.bak
Unescape View File

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

Write Preview
Loading…
Cancel
Save