| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * Combines classes from javac.custom.classpath property and ${out.dir}/classes | 6 * Combines classes from javac.custom.classpath property and ${out.dir}/classes |
| 7 * into a single jar file ${ant.project.name}-debug.jar and places the file in | 7 * into a single jar file ${ant.project.name}.jar and places the file in |
| 8 * ${lib.java.dir}. | 8 * ${lib.java.dir}. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 importClass(java.io.File); | 11 importClass(java.io.File); |
| 12 importClass(org.apache.tools.ant.types.Reference); | 12 importClass(org.apache.tools.ant.types.Reference); |
| 13 importClass(org.apache.tools.ant.types.FileSet); | 13 importClass(org.apache.tools.ant.types.FileSet); |
| 14 importClass(org.apache.tools.ant.types.ZipFileSet); | 14 importClass(org.apache.tools.ant.types.ZipFileSet); |
| 15 importClass(org.apache.tools.ant.taskdefs.Zip); | 15 importClass(org.apache.tools.ant.taskdefs.Zip); |
| 16 | 16 |
| 17 var echo = project.createTask("echo"); | 17 var echo = project.createTask("echo"); |
| 18 var jarTask = project.createTask("jar"); | 18 var jarTask = project.createTask("jar"); |
| 19 | 19 |
| 20 // Do not allow duplicates in the jar, the default behavior of Jar task | 20 // Do not allow duplicates in the jar, the default behavior of Jar task |
| 21 // is "add" which means duplicates are allowed. | 21 // is "add" which means duplicates are allowed. |
| 22 // This can cause a class file to be included multiple times, setting the | 22 // This can cause a class file to be included multiple times, setting the |
| 23 // duplicate to "preserve" ensures that only the first definition is included. | 23 // duplicate to "preserve" ensures that only the first definition is included. |
| 24 | 24 |
| 25 var duplicate = Zip.Duplicate(); | 25 var duplicate = Zip.Duplicate(); |
| 26 duplicate.setValue("preserve"); | 26 duplicate.setValue("preserve"); |
| 27 jarTask.setDuplicate(duplicate); | 27 jarTask.setDuplicate(duplicate); |
| 28 | 28 |
| 29 var destFile = project.getProperty("ant.project.name") + "-debug.jar"; | 29 var destFile = project.getProperty("ant.project.name") + ".jar"; |
| 30 var destPath = File(project.getProperty("test.lib.java.dir") + "/" + destFile); | 30 var destPath = File(project.getProperty("test.lib.java.dir") + "/" + destFile); |
| 31 jarTask.setDestFile(destPath); | 31 jarTask.setDestFile(destPath); |
| 32 | 32 |
| 33 // Include all the jars in the classpath. | 33 // Include all the jars in the classpath. |
| 34 var javacCustomClasspath = | 34 var javacCustomClasspath = |
| 35 project.getReference("javac.custom.classpath").list(); | 35 project.getReference("javac.custom.classpath").list(); |
| 36 | 36 |
| 37 for (var i in javacCustomClasspath) { | 37 for (var i in javacCustomClasspath) { |
| 38 var fileName = javacCustomClasspath[i] | 38 var fileName = javacCustomClasspath[i] |
| 39 var fileExtension = fileName.split("\\.").pop(); | 39 var fileExtension = fileName.split("\\.").pop(); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 61 var exclusionString = ""; | 61 var exclusionString = ""; |
| 62 for (var i in excludedClasses) { | 62 for (var i in excludedClasses) { |
| 63 exclusionString += appPackagePath+ "/" + excludedClasses[i] + " "; | 63 exclusionString += appPackagePath+ "/" + excludedClasses[i] + " "; |
| 64 } | 64 } |
| 65 | 65 |
| 66 jarTask.setExcludes(exclusionString); | 66 jarTask.setExcludes(exclusionString); |
| 67 echo.setMessage("Creating test jar: " + | 67 echo.setMessage("Creating test jar: " + |
| 68 jarTask.getDestFile().getAbsolutePath()); | 68 jarTask.getDestFile().getAbsolutePath()); |
| 69 echo.perform(); | 69 echo.perform(); |
| 70 jarTask.perform(); | 70 jarTask.perform(); |
| OLD | NEW |