@@ -46,29 +46,27 @@ minecraft {
46
46
replaceIn ' LibMisc.java' // I may have missed another file, though I can only find it in here.
47
47
}
48
48
49
- // This here is for FTP
49
+ // This here is for SCP
50
50
repositories {
51
51
mavenCentral()
52
52
}
53
53
configurations {
54
- ftpAntTask
54
+ sshAntTask
55
55
}
56
- // End of the FTP config
56
+
57
+ // End of the SCP config
58
+
57
59
dependencies {
58
60
compile files(
59
- ' Baubles-deobf.jar'
61
+ ' Baubles-deobf.jar'
60
62
)
61
63
compile " codechicken:CodeChickenLib:1.7.10-1.1.1.109:dev"
62
64
compile " codechicken:CodeChickenCore:1.7.10-1.0.2.9:dev"
63
65
compile " codechicken:NotEnoughItems:1.7.10-1.0.2.15:dev"
64
66
compile " codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev"
65
67
66
- // and a bit more for FTP
67
- ftpAntTask module(" org.apache.ant:ant-commons-net:1.7.0" ) {
68
- module(" commons-net:commons-net:1.4.1" ) {
69
- dependencies(" oro:oro:2.0.8@jar" )
70
- }
71
- }
68
+ // and a bit more for SCP
69
+ sshAntTask " org.apache.ant:ant-jsch:1.7.1" , " jsch:jsch:0.1.29"
72
70
}
73
71
74
72
processResources {
@@ -150,50 +148,52 @@ task sort(type: Delete) {
150
148
/**
151
149
* This is the upload task from the build.xml
152
150
*/
153
- task upload (dependsOn : ' reobf ' ) << {
154
- ftp( action : ' mkdir ' , remotedir : ' /files' )
155
- ftp( action : ' send ' , remotedir : ' /files' ) {
151
+ task upload () << {
152
+ scp( dir : ' /files' )
153
+ scp( dir : ' /files' ) {
156
154
fileset(file : jar. archivePath)
157
155
}
158
156
159
- ftp( action : ' send ' , remotedir : ' /files/deobf' ) {
157
+ scp( dir : ' /files/deobf' ) {
160
158
fileset(file : deobfJar. archivePath)
161
159
}
162
160
163
- ftp( action : ' send ' , remotedir : ' . ' ) {
161
+ scp {
164
162
fileset(file : ' web/changelog.txt' )
165
163
fileset(file : ' web/versions.ini' )
166
164
}
167
165
}
168
166
167
+ void scp (String dir = ' ' , Closure antFileset = {}) {
168
+ ant {
169
+ taskdef(
170
+ name : ' scp' ,
171
+ classname : ' org.apache.tools.ant.taskdefs.optional.ssh.Scp' ,
172
+ classpath : configurations. sshAntTask. asPath)
173
+
174
+ String dirstr = priv. scp_dir + dir
175
+ Map scpArgs = args + [
176
+ verbose : ' yes' ,
177
+ todir : dirstr,
178
+ password : priv. scp_pass,
179
+ ]
180
+
181
+ delegate. scp(scpArgs) {
182
+ antFileset. delegate = delegate
183
+ antFileset()
184
+ }
185
+ }
186
+ }
187
+
169
188
/**
170
189
* This is deply_web task
171
190
*/
172
191
task deployWeb << {
173
- ftp( action : ' send ' , remotedir : ' .' ) {
192
+ scp( dir : ' .' ) {
174
193
fileset(dir : ' web' ) // everything from the web directory
175
194
}
176
195
}
177
196
178
- // simple function that we can use
179
- // Got this from: http://svn.codehaus.org/gradle/website/build.gradle
180
- void ftp (Map args , Closure antFileset = {}) {
181
- ant {
182
- taskdef(name : ' ftp' ,
183
- classname : ' org.apache.tools.ant.taskdefs.optional.net.FTP' ,
184
- classpath : configurations. ftpAntTask. asPath)
185
- Map ftpArgs = args + [ // some default options
186
- verbose : ' yes' ,
187
- server : priv. host,
188
- userid : priv. user,
189
- password : priv. pass
190
- ]
191
- delegate. ftp(ftpArgs) {
192
- antFileset. delegate = delegate
193
- antFileset()
194
- }
195
- }
196
- }
197
197
198
198
def parseConfig (File config ) {
199
199
config. withReader {
@@ -218,6 +218,4 @@ curse {
218
218
relatedProject ' baubles' : ' requiredLibrary'
219
219
}
220
220
221
- // change this so it only increments on upload
222
- upload. dependsOn tasks. incrementBuildNumber
223
- defaultTasks ' clean' , ' build' , ' sort' , ' forgecraft' , ' curse' , ' upload' // remove clean if you want faster builds, this will stop rare inconsistancies.
221
+ defaultTasks ' clean' , ' build' , ' sort' , ' forgecraft' , ' incrementBuildNumber' , ' curse' , ' upload'
0 commit comments