Merge lp:~james-page/ubuntu/natty/groovy/fix-661230 into lp:ubuntu/natty/groovy
- Natty (11.04)
- fix-661230
- Merge into natty
Proposed by
James Page
Status: | Merged |
---|---|
Merge reported by: | James Page |
Merged at revision: | not available |
Proposed branch: | lp:~james-page/ubuntu/natty/groovy/fix-661230 |
Merge into: | lp:ubuntu/natty/groovy |
Diff against target: |
81860 lines (+37105/-21914) 512 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/0001-start-scripts.patch/src/bin/startGroovy (+271/-0) .pc/0002-ant-build.diff.patch/build.xml (+902/-0) .pc/0002-ant-build.diff.patch/config/ant/build-setup.xml (+78/-0) .pc/0003-disable-bnd.diff.patch/build.xml (+910/-0) .pc/ant-build.diff/build.xml (+0/-865) .pc/ant-build.diff/config/ant/build-setup.xml (+0/-78) .pc/applied-patches (+3/-3) .pc/disable-bnd.diff/build.xml (+0/-872) .pc/start-scripts.patch/src/bin/startGroovy (+0/-272) build.properties (+3/-5) build.xml (+120/-82) config/ant/build-maven.xml (+16/-6) config/bnd/groovy-all-jdk14.bnd (+0/-4) config/bnd/groovy-jdk14.bnd (+0/-4) config/checkstyle/codeHeader.txt (+15/-0) config/checkstyle/config.xml (+3/-0) config/maven/groovy-tools.pom (+3/-3) config/maven/settings.xml (+10/-0) debian/README.Debian (+19/-0) debian/changelog (+46/-48) debian/compat (+1/-1) debian/control (+5/-5) debian/copyright (+18/-2) debian/groovy.links (+1/-0) debian/patches/0001-start-scripts.patch (+44/-0) debian/patches/0002-ant-build.diff.patch (+174/-0) debian/patches/0003-disable-bnd.diff.patch (+23/-0) debian/patches/ant-build.diff (+0/-172) debian/patches/disable-bnd.diff (+0/-13) debian/patches/series (+3/-3) debian/patches/start-scripts.patch (+0/-34) debian/rules (+2/-1) pom.xml (+75/-34) security/groovy.policy (+0/-4) src/bin/grape.bat (+3/-2) src/bin/groovy.bat (+3/-2) src/bin/groovyConsole.bat (+3/-2) src/bin/groovyc.bat (+3/-2) src/bin/groovydoc (+33/-0) src/bin/groovydoc.bat (+19/-0) src/bin/groovysh.bat (+3/-2) src/bin/java2groovy.bat (+1/-0) src/bin/startGroovy (+4/-5) src/bin/startGroovy.bat (+3/-2) src/examples/transforms/global/LoggingASTTransformation.groovy (+1/-1) src/examples/transforms/global/LoggingExample.groovy (+1/-1) src/examples/transforms/global/META-INF/services/org.codehaus.groovy.transform.ASTTransformation (+1/-2) src/examples/transforms/local/LoggingASTTransformation.groovy (+1/-1) src/examples/transforms/local/LoggingExample.groovy (+1/-1) src/examples/transforms/local/WithLogging.groovy (+2/-2) src/main/groovy/grape/GrapeIvy.groovy (+12/-7) src/main/groovy/inspect/swingui/TableSorter.java (+1/-4) src/main/groovy/io/FileType.java (+28/-0) src/main/groovy/io/FileVisitResult.java (+32/-0) src/main/groovy/jmx/builder/JmxBeanFactory.groovy (+56/-56) src/main/groovy/jmx/builder/JmxBeansFactory.groovy (+13/-4) src/main/groovy/jmx/builder/package-info.groovy (+20/-0) src/main/groovy/lang/Closure.java (+61/-3) src/main/groovy/lang/Delegate.java (+14/-3) src/main/groovy/lang/ExpandoMetaClass.java (+668/-514) src/main/groovy/lang/ExpandoMetaClassCreationHandle.java (+1/-1) src/main/groovy/lang/GroovyClassLoader.java (+137/-122) src/main/groovy/lang/GroovyCodeSource.java (+16/-1) src/main/groovy/lang/GroovyShell.java (+55/-6) src/main/groovy/lang/Immutable.java (+23/-8) src/main/groovy/lang/IntRange.java (+12/-4) src/main/groovy/lang/Lazy.java (+95/-23) src/main/groovy/lang/MapWithDefault.java (+102/-0) src/main/groovy/lang/MetaBeanProperty.java (+10/-5) src/main/groovy/lang/MetaClass.java (+4/-4) src/main/groovy/lang/MetaClassImpl.java (+47/-37) src/main/groovy/lang/MetaClassRegistry.java (+39/-16) src/main/groovy/lang/MutableMetaClass.java (+3/-3) src/main/groovy/lang/ObjectRange.java (+16/-4) src/main/groovy/lang/Range.java (+2/-2) src/main/groovy/lang/Reference.java (+8/-6) src/main/groovy/lang/Script.java (+39/-1) src/main/groovy/lang/Writable.java (+2/-2) src/main/groovy/mock/interceptor/Demand.groovy (+9/-6) src/main/groovy/mock/interceptor/Ignore.groovy (+43/-0) src/main/groovy/mock/interceptor/LooseExpectation.groovy (+16/-12) src/main/groovy/mock/interceptor/MockFor.groovy (+224/-45) src/main/groovy/mock/interceptor/MockInterceptor.groovy (+20/-9) src/main/groovy/mock/interceptor/MockProxyMetaClass.java (+106/-26) src/main/groovy/mock/interceptor/StrictExpectation.groovy (+14/-10) src/main/groovy/mock/interceptor/StubFor.groovy (+115/-65) src/main/groovy/servlet/AbstractHttpServlet.java (+33/-29) src/main/groovy/servlet/TemplateServlet.java (+22/-1) src/main/groovy/sql/BatchingStatementWrapper.java (+84/-0) src/main/groovy/sql/DataSet.java (+30/-5) src/main/groovy/sql/Sql.java (+703/-167) src/main/groovy/sql/SqlWithParams.java (+21/-0) src/main/groovy/swing/LookAndFeelHelper.groovy (+31/-3) src/main/groovy/swing/SwingBuilder.groovy (+2/-2) src/main/groovy/swing/factory/BindGroupFactory.groovy (+16/-5) src/main/groovy/swing/factory/RendererFactory.groovy (+1/-1) src/main/groovy/swing/impl/ClosureRenderer.java (+1/-1) src/main/groovy/text/XmlTemplateEngine.java (+2/-2) src/main/groovy/time/BaseDuration.java (+2/-2) src/main/groovy/time/TimeCategory.java (+9/-9) src/main/groovy/transform/IndexedProperty.java (+70/-0) src/main/groovy/transform/InheritConstructors.java (+112/-0) src/main/groovy/transform/Synchronized.java (+116/-0) src/main/groovy/ui/Console.groovy (+231/-77) src/main/groovy/ui/ConsoleActions.groovy (+19/-1) src/main/groovy/ui/ConsoleApplet.groovy (+16/-4) src/main/groovy/ui/ConsoleTextEditor.java (+1/-4) src/main/groovy/ui/ConsoleView.groovy (+2/-16) src/main/groovy/ui/GroovyMain.java (+4/-2) src/main/groovy/ui/SystemOutputInterceptor.java (+31/-7) src/main/groovy/ui/text/TextEditor.java (+4/-3) src/main/groovy/ui/view/BasicContentPane.groovy (+19/-4) src/main/groovy/ui/view/BasicMenuBar.groovy (+18/-0) src/main/groovy/ui/view/BasicStatusBar.groovy (+15/-0) src/main/groovy/ui/view/BasicToolBar.groovy (+16/-0) src/main/groovy/ui/view/Defaults.groovy (+15/-0) src/main/groovy/ui/view/GTKDefaults.groovy (+15/-0) src/main/groovy/ui/view/MacOSXDefaults.groovy (+15/-0) src/main/groovy/ui/view/MacOSXMenuBar.groovy (+18/-0) src/main/groovy/ui/view/WindowsDefaults.groovy (+15/-0) src/main/groovy/util/AntBuilder.java (+83/-39) src/main/groovy/util/CliBuilder.groovy (+287/-55) src/main/groovy/util/ConfigSlurper.groovy (+3/-2) src/main/groovy/util/GroovyScriptEngine.java (+78/-34) src/main/groovy/util/GroovyTestCase.java (+57/-17) src/main/groovy/util/GroovyTestSuite.java (+3/-3) src/main/groovy/util/JavadocAssertionTestBuilder.groovy (+138/-0) src/main/groovy/util/JavadocAssertionTestSuite.groovy (+119/-0) src/main/groovy/util/Node.java (+67/-2) src/main/groovy/util/NodeList.java (+22/-11) src/main/groovy/util/OrderBy.java (+8/-23) src/main/groovy/util/PermutationGenerator.java (+21/-6) src/main/groovy/util/ProxyGenerator.java (+19/-19) src/main/groovy/util/XmlNodePrinter.java (+15/-2) src/main/groovy/util/XmlParser.java (+11/-1) src/main/groovy/util/XmlSlurper.java (+33/-5) src/main/groovy/util/slurpersupport/Attribute.java (+14/-2) src/main/groovy/util/slurpersupport/Attributes.java (+18/-6) src/main/groovy/util/slurpersupport/FilteredAttributes.java (+8/-3) src/main/groovy/util/slurpersupport/FilteredNodeChildren.java (+9/-3) src/main/groovy/util/slurpersupport/GPathResult.java (+52/-88) src/main/groovy/util/slurpersupport/NoChildren.java (+7/-7) src/main/groovy/util/slurpersupport/Node.java (+14/-7) src/main/groovy/util/slurpersupport/NodeChild.java (+16/-4) src/main/groovy/util/slurpersupport/NodeChildren.java (+15/-15) src/main/groovy/util/slurpersupport/NodeIterator.java (+3/-2) src/main/groovy/util/slurpersupport/ReplacementNode.java (+7/-2) src/main/groovy/xml/SAXBuilder.java (+2/-2) src/main/groovy/xml/StaxBuilder.groovy (+34/-4) src/main/groovy/xml/StreamingMarkupBuilder.groovy (+29/-15) src/main/groovy/xml/XmlUtil.java (+134/-13) src/main/groovy/xml/dom/DOMCategory.java (+134/-6) src/main/org/codehaus/groovy/ant/Groovy.java (+36/-9) src/main/org/codehaus/groovy/ant/Groovyc.java (+114/-18) src/main/org/codehaus/groovy/ant/Groovydoc.java (+123/-52) src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java (+445/-406) src/main/org/codehaus/groovy/antlr/EnumHelper.java (+15/-0) src/main/org/codehaus/groovy/antlr/GroovySourceToken.java (+4/-5) src/main/org/codehaus/groovy/antlr/SourceInfo.java (+15/-0) src/main/org/codehaus/groovy/antlr/groovy.g (+106/-95) src/main/org/codehaus/groovy/antlr/java/Groovifier.java (+10/-4) src/main/org/codehaus/groovy/antlr/parser/GroovyLexer.java (+165/-131) src/main/org/codehaus/groovy/antlr/parser/GroovyLexer.smap (+2317/-2293) src/main/org/codehaus/groovy/antlr/parser/GroovyRecognizer.java (+1594/-1198) src/main/org/codehaus/groovy/antlr/parser/GroovyRecognizer.smap (+8019/-7793) src/main/org/codehaus/groovy/antlr/parser/GroovyTokenTypes.java (+95/-93) src/main/org/codehaus/groovy/antlr/parser/GroovyTokenTypes.txt (+95/-93) src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java (+1/-1) src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java (+2/-2) src/main/org/codehaus/groovy/antlr/treewalker/Visitor.java (+2/-2) src/main/org/codehaus/groovy/ast/AnnotatedNode.java (+10/-1) src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java (+4/-0) src/main/org/codehaus/groovy/ast/ClassHelper.java (+4/-4) src/main/org/codehaus/groovy/ast/ClassNode.java (+70/-56) src/main/org/codehaus/groovy/ast/CompileUnit.java (+3/-3) src/main/org/codehaus/groovy/ast/EnumConstantClassNode.java (+36/-0) src/main/org/codehaus/groovy/ast/ImportNode.java (+7/-6) src/main/org/codehaus/groovy/ast/InnerClassNode.java (+10/-1) src/main/org/codehaus/groovy/ast/MethodNode.java (+23/-22) src/main/org/codehaus/groovy/ast/ModuleNode.java (+31/-11) src/main/org/codehaus/groovy/ast/Parameter.java (+15/-15) src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy (+15/-2) src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.groovy (+15/-0) src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy (+15/-1) src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy (+15/-1) src/main/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java (+24/-19) src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java (+32/-9) src/main/org/codehaus/groovy/binding/AggregateBinding.java (+15/-0) src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java (+43/-0) src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java (+413/-351) src/main/org/codehaus/groovy/classgen/BytecodeHelper.java (+19/-12) src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java (+118/-85) src/main/org/codehaus/groovy/classgen/CompileStack.java (+122/-45) src/main/org/codehaus/groovy/classgen/EnumVisitor.java (+27/-5) src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java (+1/-1) src/main/org/codehaus/groovy/classgen/InnerClassVisitor.java (+151/-46) src/main/org/codehaus/groovy/classgen/ReturnAdder.java (+11/-7) src/main/org/codehaus/groovy/classgen/RuntimeIncompleteClassException.java (+0/-32) src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java (+8/-54) src/main/org/codehaus/groovy/classgen/Verifier.java (+182/-128) src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java (+20/-45) src/main/org/codehaus/groovy/classgen/genArrayAccess.groovy (+15/-0) src/main/org/codehaus/groovy/classgen/genArrays.groovy (+15/-0) src/main/org/codehaus/groovy/classgen/genDgmMath.groovy (+15/-0) src/main/org/codehaus/groovy/classgen/genMathModification.groovy (+15/-0) src/main/org/codehaus/groovy/control/CompilationUnit.java (+50/-80) src/main/org/codehaus/groovy/control/CompilerConfiguration.java (+13/-2) src/main/org/codehaus/groovy/control/ResolveVisitor.java (+189/-48) src/main/org/codehaus/groovy/control/StaticImportVisitor.java (+241/-55) src/main/org/codehaus/groovy/groovydoc/GroovyRootDoc.java (+1/-1) src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java (+23/-32) src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java (+31/-38) src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java (+12/-5) src/main/org/codehaus/groovy/reflection/CachedField.java (+8/-1) src/main/org/codehaus/groovy/reflection/ClassInfo.java (+4/-2) src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java (+15/-0) src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java (+197/-19) src/main/org/codehaus/groovy/reflection/MethodHandle.java (+15/-0) src/main/org/codehaus/groovy/reflection/ParameterTypes.java (+1/-1) src/main/org/codehaus/groovy/reflection/handlegen.groovy (+15/-0) src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java (+15/-0) src/main/org/codehaus/groovy/reflection/stdclasses/FloatCachedClass.java (+4/-1) src/main/org/codehaus/groovy/runtime/CurriedClosure.java (+66/-29) src/main/org/codehaus/groovy/runtime/DateGroovyMethods.java (+554/-0) src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java (+2884/-956) src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java (+3/-3) src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java (+7/-6) src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java (+225/-0) src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java (+25/-8) src/main/org/codehaus/groovy/runtime/HandleMetaClass.java (+1/-1) src/main/org/codehaus/groovy/runtime/InvokerHelper.java (+55/-13) src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java (+5/-5) src/main/org/codehaus/groovy/runtime/MetaClassHelper.java (+0/-2) src/main/org/codehaus/groovy/runtime/MethodClosure.java (+8/-25) src/main/org/codehaus/groovy/runtime/MethodRankHelper.java (+71/-10) src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java (+46/-0) src/main/org/codehaus/groovy/runtime/ReverseListIterator.java (+15/-0) src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java (+5/-1) src/main/org/codehaus/groovy/runtime/StackTraceUtils.java (+4/-3) src/main/org/codehaus/groovy/runtime/SwingGroovyMethods.java (+24/-14) src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java (+5/-1) src/main/org/codehaus/groovy/runtime/callsite/CallSite.java (+15/-0) src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java (+15/-0) src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java (+15/-0) src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java (+15/-0) src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java (+15/-0) src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java (+15/-0) src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java (+15/-0) src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java (+15/-0) src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java (+15/-0) src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java (+12/-12) src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java (+23/-0) src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java (+42/-49) src/main/org/codehaus/groovy/runtime/metaclass/MemoryAwareConcurrentReadMap.java (+30/-36) src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java (+36/-20) src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java (+15/-0) src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java (+15/-0) src/main/org/codehaus/groovy/runtime/typehandling/BigDecimalMath.java (+51/-59) src/main/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java (+1/-1) src/main/org/codehaus/groovy/runtime/typehandling/ClassDistance.java (+0/-160) src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java (+29/-10) src/main/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java (+1/-1) src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java (+20/-3) src/main/org/codehaus/groovy/runtime/typehandling/IntegerMath.java (+1/-1) src/main/org/codehaus/groovy/runtime/typehandling/LongMath.java (+1/-1) src/main/org/codehaus/groovy/runtime/typehandling/NumberMathModificationInfo.java (+15/-0) src/main/org/codehaus/groovy/runtime/wrappers/BooleanWrapper.java (+4/-6) src/main/org/codehaus/groovy/runtime/wrappers/ByteWrapper.java (+4/-7) src/main/org/codehaus/groovy/runtime/wrappers/CharWrapper.java (+4/-6) src/main/org/codehaus/groovy/runtime/wrappers/DoubleWrapper.java (+4/-6) src/main/org/codehaus/groovy/runtime/wrappers/FloatWrapper.java (+4/-6) src/main/org/codehaus/groovy/runtime/wrappers/GroovyObjectWrapper.java (+46/-52) src/main/org/codehaus/groovy/runtime/wrappers/IntWrapper.java (+4/-8) src/main/org/codehaus/groovy/runtime/wrappers/LongWrapper.java (+4/-6) src/main/org/codehaus/groovy/runtime/wrappers/PojoWrapper.java (+47/-54) src/main/org/codehaus/groovy/runtime/wrappers/ShortWrapper.java (+2/-3) src/main/org/codehaus/groovy/runtime/wrappers/Wrapper.java (+25/-252) src/main/org/codehaus/groovy/syntax/RuntimeParserException.java (+1/-2) src/main/org/codehaus/groovy/tools/DgmConverter.java (+158/-139) src/main/org/codehaus/groovy/tools/FileSystemCompiler.java (+15/-14) src/main/org/codehaus/groovy/tools/LoaderConfiguration.java (+17/-5) src/main/org/codehaus/groovy/tools/RootLoader.java (+1/-1) src/main/org/codehaus/groovy/tools/StringHelper.java (+15/-0) src/main/org/codehaus/groovy/tools/ast/TranformTestHelper.groovy (+17/-3) src/main/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java (+9/-3) src/main/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java (+17/-10) src/main/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java (+83/-19) src/main/org/codehaus/groovy/tools/groovydoc/LinkArgument.java (+15/-0) src/main/org/codehaus/groovy/tools/groovydoc/Main.groovy (+240/-0) src/main/org/codehaus/groovy/tools/groovydoc/Main.properties (+67/-0) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAbstractableElementDoc.java (+34/-0) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java (+234/-47) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java (+125/-41) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java (+23/-16) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java (+18/-19) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java (+6/-6) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java (+32/-25) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java (+24/-5) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyTag.java (+15/-0) src/main/org/codehaus/groovy/tools/groovydoc/SimpleGroovyType.java (+1/-1) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java (+40/-0) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html (+44/-37) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-frame.html (+10/-10) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-summary.html (+10/-12) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/allclasses-frame.html (+3/-1) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html (+46/-49) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html (+1/-1) src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-summary.html (+25/-1) src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java (+16/-0) src/main/org/codehaus/groovy/tools/gse/StringSetMap.java (+19/-4) src/main/org/codehaus/groovy/tools/javac/JavaStubCompilationUnit.java (+2/-2) src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java (+174/-96) src/main/org/codehaus/groovy/tools/shell/Groovysh.groovy (+13/-5) src/main/org/codehaus/groovy/tools/shell/IO.java (+4/-10) src/main/org/codehaus/groovy/tools/shell/Main.groovy (+26/-5) src/main/org/codehaus/groovy/tools/shell/Main.properties (+5/-1) src/main/org/codehaus/groovy/tools/shell/util/ANSI.java (+0/-421) src/main/org/codehaus/groovy/tools/shell/util/Logger.java (+8/-13) src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java (+14/-18) src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java (+0/-1) src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java (+4/-5) src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java (+81/-32) src/main/org/codehaus/groovy/transform/GroovyASTTransformationClass.java (+15/-0) src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java (+83/-60) src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java (+164/-0) src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java (+119/-0) src/main/org/codehaus/groovy/transform/LazyASTTransformation.java (+104/-62) src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java (+3/-3) src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java (+106/-0) src/main/org/codehaus/groovy/transform/powerassert/AssertionRenderer.java (+28/-29) src/main/org/codehaus/groovy/util/AbstractConcurrentDoubleKeyMap.java (+15/-0) src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java (+20/-5) src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java (+17/-2) src/main/org/codehaus/groovy/util/Finalizable.java (+15/-0) src/main/org/codehaus/groovy/util/HashCodeHelper.java (+2/-5) src/main/org/codehaus/groovy/util/LazyReference.java (+15/-2) src/main/org/codehaus/groovy/util/LockableObject.java (+15/-0) src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java (+15/-1) src/main/org/codehaus/groovy/util/ManagedLinkedList.java (+15/-15) src/main/org/codehaus/groovy/util/ManagedReference.java (+15/-0) src/main/org/codehaus/groovy/util/Reference.java (+15/-0) src/main/org/codehaus/groovy/util/ReferenceBundle.java (+15/-15) src/main/org/codehaus/groovy/util/ReferenceManager.java (+15/-0) src/main/org/codehaus/groovy/util/ReferenceType.java (+15/-0) src/main/org/codehaus/groovy/util/ReleaseInfo.java (+47/-38) src/main/org/codehaus/groovy/util/StringUtil.groovy (+51/-0) src/main/org/codehaus/groovy/vmplugin/VMPluginFactory.java (+18/-5) src/main/org/codehaus/groovy/vmplugin/v5/Java5.java (+8/-1) src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java (+4/-2) src/main/org/codehaus/groovy/vmplugin/v5/TestNgUtils.java (+1/-1) src/main/org/codehaus/groovy/vmplugin/v6/Java6.java (+35/-0) src/main/org/codehaus/groovy/vmplugin/v6/PluginDefaultGroovyMethods.java (+92/-0) src/main/org/codehaus/groovy/vmplugin/v6/PluginStaticGroovyMethods.java (+42/-0) src/main/overview.html (+3/-1) src/main/overviewj.html (+21/-0) src/test/Outer3.groovy (+19/-0) src/test/Outer4.groovy (+19/-0) src/test/UberTestCaseGroovySourceCodehausPackages.java (+2/-1) src/test/UberTestCaseGroovySourceCodehausPackages_VM6.java (+30/-0) src/test/UberTestCaseGroovySourceRootPackage.java (+23/-52) src/test/UberTestCaseGroovySourceSubPackages.java (+9/-5) src/test/gls/CompilableTestSupport.groovy (+27/-28) src/test/gls/enums/EnumTest.groovy (+126/-28) src/test/gls/generics/GenericsTest.groovy (+30/-0) src/test/gls/innerClass/InnerClassTest.groovy (+24/-7) src/test/gls/invocation/ClassDuplicationTest.groovy (+21/-0) src/test/gls/invocation/MethodSelectionTest.groovy (+37/-0) src/test/gls/syntax/ParsingTest.groovy (+6/-0) src/test/groovy/ClosureCurryTest.groovy (+31/-1) src/test/groovy/DateTest.groovy (+6/-0) src/test/groovy/EqualsTest.groovy (+12/-1) src/test/groovy/FileTest.groovy (+342/-92) src/test/groovy/GroovyClosureMethodsTest.groovy (+12/-0) src/test/groovy/GroovyMethodsTest.groovy (+92/-78) src/test/groovy/GroovyTruthTest.groovy (+20/-0) src/test/groovy/ListTest.groovy (+2/-1) src/test/groovy/MapTest.groovy (+25/-0) src/test/groovy/Property2Test.groovy (+55/-70) src/test/groovy/PropertyTest.groovy (+2/-2) src/test/groovy/SortTest.groovy (+10/-1) src/test/groovy/StaticImportTarget.groovy (+1/-0) src/test/groovy/StaticImportTest.groovy (+186/-3) src/test/groovy/StringTest.groovy (+6/-0) src/test/groovy/SwitchTest.groovy (+1/-0) src/test/groovy/bugs/GROOVY3934Helper.groovy (+1/-0) src/test/groovy/bugs/Groovy1465Bug.groovy (+39/-0) src/test/groovy/bugs/Groovy3853Bug.groovy (+0/-34) src/test/groovy/bugs/Groovy3871Bug.groovy (+44/-0) src/test/groovy/bugs/Groovy3949Bug.groovy (+14/-0) src/test/groovy/bugs/Groovy3989Bug.groovy (+19/-0) src/test/groovy/bugs/Groovy4006Bug.groovy (+160/-0) src/test/groovy/bugs/Groovy4009Bug.groovy (+19/-0) src/test/groovy/bugs/Groovy4025Bug.groovy (+24/-0) src/test/groovy/bugs/Groovy4029Bug.groovy (+9/-0) src/test/groovy/bugs/Groovy4035Bug.groovy (+30/-0) src/test/groovy/bugs/Groovy4038Bug.groovy (+10/-0) src/test/groovy/bugs/Groovy4043Bug.groovy (+17/-0) src/test/groovy/bugs/Groovy4046Bug.groovy (+11/-0) src/test/groovy/bugs/Groovy4069Bug.groovy (+116/-0) src/test/groovy/bugs/Groovy4075Bug.groovy (+23/-0) src/test/groovy/bugs/Groovy4078Bug.groovy (+31/-0) src/test/groovy/bugs/Groovy4080Bug.groovy (+18/-0) src/test/groovy/bugs/Groovy4081Bug.groovy (+20/-0) src/test/groovy/bugs/Groovy4098Bug.groovy (+150/-0) src/test/groovy/bugs/Groovy4098Child.groovy (+35/-0) src/test/groovy/bugs/Groovy4098Parent.groovy (+23/-0) src/test/groovy/bugs/Groovy4104A.java (+29/-0) src/test/groovy/bugs/Groovy4104B.java (+19/-0) src/test/groovy/bugs/Groovy4104Bug.groovy (+31/-0) src/test/groovy/bugs/Groovy4106Bug.groovy (+25/-0) src/test/groovy/bugs/Groovy4107Bug.groovy (+34/-0) src/test/groovy/bugs/Groovy4111Bug.groovy (+38/-0) src/test/groovy/bugs/Groovy4116Bug.groovy (+63/-0) src/test/groovy/bugs/Groovy4119Bug.groovy (+35/-0) src/test/groovy/bugs/Groovy4120Bug.groovy (+54/-0) src/test/groovy/bugs/Groovy4121Bug.groovy (+45/-0) src/test/groovy/bugs/Groovy4129Bug.groovy (+32/-0) src/test/groovy/bugs/Groovy4131Bug.groovy (+30/-0) src/test/groovy/bugs/Groovy4133Bug.groovy (+31/-0) src/test/groovy/bugs/Groovy4134Bug.groovy (+26/-0) src/test/groovy/bugs/Groovy4139Bug.groovy (+31/-0) src/test/groovy/bugs/Groovy4145.groovy (+7/-0) src/test/groovy/bugs/Groovy4151Bug.groovy (+30/-0) src/test/groovy/bugs/Groovy4169Bug.groovy (+34/-0) src/test/groovy/bugs/Groovy4170Bug.groovy (+35/-0) src/test/groovy/bugs/Groovy4188Bug.groovy (+36/-0) src/test/groovy/bugs/Groovy4190Bug.groovy (+48/-0) src/test/groovy/bugs/Groovy4191Bug.groovy (+28/-0) src/test/groovy/bugs/Groovy4193Bug.groovy (+28/-0) src/test/groovy/bugs/Groovy4202Bug.groovy (+18/-0) src/test/groovy/bugs/Groovy4206Bug.groovy (+16/-0) src/test/groovy/bugs/Groovy4235Bug.groovy (+15/-0) src/test/groovy/bugs/Groovy4241Bug.groovy (+22/-0) src/test/groovy/bugs/Groovy4243Bug.groovy (+31/-0) src/test/groovy/bugs/Groovy4246Bug.groovy (+44/-0) src/test/groovy/bugs/Groovy4247Bug.groovy (+19/-0) src/test/groovy/bugs/Groovy4252Bug.groovy (+83/-0) src/test/groovy/bugs/Groovy4264Bug.groovy (+66/-0) src/test/groovy/bugs/Groovy4272Bug.groovy (+29/-0) src/test/groovy/bugs/Groovy4273Bug.groovy (+62/-0) src/test/groovy/bugs/Groovy4285Bug.groovy (+38/-0) src/test/groovy/bugs/Groovy4293Bug.groovy (+37/-0) src/test/groovy/bugs/GroovyInnerEnumBug.groovy (+29/-0) src/test/groovy/bugs/Groovy_2473Bug.groovy (+2/-2) src/test/groovy/bugs/MyConstants4272.java (+13/-0) src/test/groovy/bugs/MyConstantsASTTransformation4272.groovy (+30/-0) src/test/groovy/bugs/SynchronizedBytecodeBug.groovy (+15/-1) src/test/groovy/execute/ExecuteTest.groovy (+139/-0) src/test/groovy/execute/ExecuteTest_Windows.groovy (+15/-0) src/test/groovy/grape/GrabErrorIsolationTest.groovy (+53/-0) src/test/groovy/lang/ClassReloadingTest.groovy (+26/-0) src/test/groovy/lang/ExceptionTest.groovy (+72/-0) src/test/groovy/lang/GroovyClassLoaderTest.groovy (+16/-18) src/test/groovy/lang/GroovyCodeSourceTest.groovy (+79/-0) src/test/groovy/lang/GroovyShellTest.java (+43/-1) src/test/groovy/lang/ReferenceSerializationTest.groovy (+96/-0) src/test/groovy/lang/StripMarginTest.groovy (+75/-0) src/test/groovy/lang/SyntheticReturnTest.groovy (+2/-2) src/test/groovy/lang/gcldeadlock/DeadlockBugUtil.groovy (+3/-0) src/test/groovy/lang/gcldeadlock/GroovyClassLoaderDeadlockTest.java (+62/-0) src/test/groovy/lang/gcldeadlock/script0.groovy (+3/-0) src/test/groovy/lang/gcldeadlock/script1.groovy (+3/-0) src/test/groovy/mock/interceptor/HalfMockTest.groovy (+124/-0) src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy (+67/-5) src/test/groovy/mock/interceptor/MockForJavaTest.groovy (+4/-4) src/test/groovy/mock/interceptor/StubForJavaTest.groovy (+10/-5) src/test/groovy/operator/BitwiseOperatorsTest.groovy (+17/-22) src/test/groovy/security/SecurityTestSupport.java (+4/-4) src/test/groovy/servlet/AbstractHttpServletTest.groovy (+14/-4) src/test/groovy/sql/SqlBatchTest.groovy (+17/-0) src/test/groovy/sql/SqlCacheTest.groovy (+2/-0) src/test/groovy/sql/SqlCompleteTest.groovy (+42/-0) src/test/groovy/swing/SwingMetaMethodsTest.groovy (+2/-0) src/test/groovy/text/XmlTemplateEngineTest.java (+7/-0) src/test/groovy/time/TimeCategoryTest.groovy (+20/-4) src/test/groovy/util/AntTest.groovy (+3/-0) src/test/groovy/util/CliBuilderTest.groovy (+389/-301) src/test/groovy/util/ConfigSlurperTest.groovy (+34/-2) src/test/groovy/util/GroovyScriptEngineTest.groovy (+111/-11) src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy (+132/-0) src/test/groovy/util/XmlParserTest.groovy (+25/-0) src/test/groovy/util/XmlSlurperTest.groovy (+25/-0) src/test/groovy/xml/BuilderTestSupport.groovy (+9/-0) src/test/groovy/xml/GpathSyntaxTestSupport.groovy (+168/-6) src/test/groovy/xml/MarkupBuilderTest.groovy (+13/-7) src/test/groovy/xml/StreamingMarkupBuilderTest.groovy (+5/-0) src/test/groovy/xml/dom/DOMCategoryTest.groovy (+15/-1) src/test/groovy/xml/vm6/StaxBuilderTest.groovy (+17/-12) src/test/org/codehaus/groovy/ant/GroovyTest.xml (+1/-1) src/test/org/codehaus/groovy/ast/LineColumnCheck.txt (+6/-6) src/test/org/codehaus/groovy/jsr223/JSR223SecurityTest.java (+132/-0) src/test/org/codehaus/groovy/jsr223/SugarTest.groovy (+16/-0) src/test/org/codehaus/groovy/jsr223/vm6/JavascriptTest.groovy (+19/-0) src/test/org/codehaus/groovy/runtime/DateGDKTest.groovy (+22/-6) src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.java (+46/-1) src/test/org/codehaus/groovy/runtime/MinusTest.groovy (+95/-80) src/test/org/codehaus/groovy/runtime/StringAsClassTest.groovy (+17/-1) src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java (+14/-45) src/test/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java (+36/-24) src/test/org/codehaus/groovy/tools/gse/DependencyTest.java (+9/-9) src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy (+79/-4) src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy (+57/-0) src/test/org/codehaus/groovy/transform/IndexedPropertyTransformTest.groovy (+47/-0) src/test/org/codehaus/groovy/transform/InheritConstructorsTransformTest.groovy (+46/-0) src/test/org/codehaus/groovy/transform/LazyTransformTest.groovy (+29/-1) src/test/org/codehaus/groovy/transform/SynchronizedTransformTest.groovy (+43/-0) src/test/org/codehaus/groovy/transform/TransformsAndCustomClassLoadersTest.groovy (+1/-1) src/test/org/codehaus/groovy/transform/powerassert/AssertionRenderingTest.groovy (+2/-2) src/test/org/codehaus/groovy/transform/powerassert/ValueRenderingTest.groovy (+43/-5) src/tools/org/codehaus/groovy/tools/DocGenerator.groovy (+45/-19) |
To merge this branch: | bzr merge lp:~james-page/ubuntu/natty/groovy/fix-661230 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chuck Short | Pending | ||
Review via email: mp+51179@code.launchpad.net |
Commit message
Description of the change
Sync groovy from debain testing and apply Ubuntu specific change to fix FTBFS with ant 1.8 (default ant in Ubuntu)
To post a comment you must log in.
- 19. By James Page
-
Fixed package maintainer
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '.pc/.quilt_patches' |
2 | --- .pc/.quilt_patches 1970-01-01 00:00:00 +0000 |
3 | +++ .pc/.quilt_patches 2011-02-24 17:57:34 +0000 |
4 | @@ -0,0 +1,1 @@ |
5 | +debian/patches |
6 | |
7 | === added file '.pc/.quilt_series' |
8 | --- .pc/.quilt_series 1970-01-01 00:00:00 +0000 |
9 | +++ .pc/.quilt_series 2011-02-24 17:57:34 +0000 |
10 | @@ -0,0 +1,1 @@ |
11 | +series |
12 | |
13 | === added directory '.pc/0001-start-scripts.patch' |
14 | === added directory '.pc/0001-start-scripts.patch/src' |
15 | === added directory '.pc/0001-start-scripts.patch/src/bin' |
16 | === added file '.pc/0001-start-scripts.patch/src/bin/startGroovy' |
17 | --- .pc/0001-start-scripts.patch/src/bin/startGroovy 1970-01-01 00:00:00 +0000 |
18 | +++ .pc/0001-start-scripts.patch/src/bin/startGroovy 2011-02-24 17:57:34 +0000 |
19 | @@ -0,0 +1,271 @@ |
20 | +# -*- mode:sh -*- |
21 | + |
22 | +############################################################################## |
23 | +## ## |
24 | +## Groovy JVM Bootstrap for UN*X ## |
25 | +## ## |
26 | +############################################################################## |
27 | + |
28 | +## |
29 | +## $Revision: 19979 $ |
30 | +## $Date: 2010-05-08 13:15:13 +0200 (Sa, 08. Mai 2010) $ |
31 | +## |
32 | + |
33 | +PROGNAME=`basename "$0"` |
34 | + |
35 | +#DIRNAME=`dirname "$0"` |
36 | + |
37 | +SCRIPT_PATH="$0" |
38 | + |
39 | +# Use the maximum available, or set MAX_FD != -1 to use that value. |
40 | +MAX_FD="maximum" |
41 | + |
42 | +warn ( ) { |
43 | + echo "${PROGNAME}: $*" |
44 | +} |
45 | + |
46 | +die ( ) { |
47 | + warn "$*" |
48 | + exit 1 |
49 | +} |
50 | + |
51 | +earlyInit ( ) { |
52 | + return |
53 | +} |
54 | + |
55 | +lateInit ( ) { |
56 | + return |
57 | +} |
58 | + |
59 | +GROOVY_STARTUP="$HOME/.groovy/startup" |
60 | +if [ -r "$GROOVY_STARTUP" ] ; then |
61 | + . "$GROOVY_STARTUP" |
62 | +fi |
63 | + |
64 | +earlyInit |
65 | + |
66 | +# OS specific support (must be 'true' or 'false'). |
67 | +cygwin=false |
68 | +msys=false |
69 | +darwin=false |
70 | +case "`uname`" in |
71 | + CYGWIN* ) |
72 | + cygwin=true |
73 | + ;; |
74 | + Darwin* ) |
75 | + darwin=true |
76 | + ;; |
77 | + MINGW* ) |
78 | + msys=true |
79 | + ;; |
80 | +esac |
81 | + |
82 | +if [ "$1" = "-cp" -o "$1" = "-classpath" -o "$1" = "--classpath" ] ; then |
83 | + CP=$2 |
84 | + shift 2 |
85 | +fi |
86 | + |
87 | +# Attempt to set JAVA_HOME if it's not already set. |
88 | +if [ -z "$JAVA_HOME" ] ; then |
89 | + if $darwin ; then |
90 | + [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home" |
91 | + [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home" |
92 | + else |
93 | + javaExecutable="`which javac`" |
94 | + [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME." |
95 | + # readlink(1) is not available as standard on Solaris 10. |
96 | + readLink=`which readlink` |
97 | + [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME." |
98 | + javaExecutable="`readlink -f \"$javaExecutable\"`" |
99 | + javaHome="`dirname \"$javaExecutable\"`" |
100 | + javaHome=`expr "$javaHome" : '\(.*\)/bin'` |
101 | + JAVA_HOME="$javaHome" |
102 | + export JAVA_HOME |
103 | + |
104 | + fi |
105 | +fi |
106 | + |
107 | +# For Cygwin, ensure paths are in UNIX format before anything is touched. |
108 | +if $cygwin ; then |
109 | + [ -n "$GROOVY_HOME" ] && GROOVY_HOME=`cygpath --unix "$GROOVY_HOME"` |
110 | + [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"` |
111 | + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` |
112 | + [ -n "$CP" ] && CP=`cygpath --path --unix "$CP"` |
113 | +else |
114 | + if [ -n "$GROOVY_HOME" -a `expr "$GROOVY_HOME":'\/$'` ] ; then |
115 | + GROOVY_HOME=`echo $GROOVY_HOME | sed -e 's/\/$//'` |
116 | + fi |
117 | +fi |
118 | + |
119 | +# For MSYS, ensure paths are in appropriate format. |
120 | +if $msys |
121 | +then |
122 | + [ -n "$JAVA_HOME" ] && JAVA_HOME=`( cd "$JAVA_HOME" ; pwd )` |
123 | +fi |
124 | + |
125 | +# Attempt to set GROOVY_HOME if it is not already set. |
126 | +if [ -z "$GROOVY_HOME" -o ! -d "$GROOVY_HOME" ] ; then |
127 | + # Resolve links: $0 may be a link to groovy's home. |
128 | + PRG="$0" |
129 | + # Need this for relative symlinks. |
130 | + while [ -h "$PRG" ] ; do |
131 | + ls=`ls -ld "$PRG"` |
132 | + link=`expr "$ls" : '.*-> \(.*\)$'` |
133 | + if expr "$link" : '/.*' > /dev/null; then |
134 | + PRG="$link" |
135 | + else |
136 | + PRG=`dirname "$PRG"`"/$link" |
137 | + fi |
138 | + done |
139 | + SAVED="`pwd`" |
140 | + cd "`dirname \"$PRG\"`/.." |
141 | + GROOVY_HOME="`pwd -P`" |
142 | + cd "$SAVED" |
143 | +fi |
144 | + |
145 | +# Set the default Groovy config if no specific one is mentioned. |
146 | +if [ -z "$GROOVY_CONF" ] ; then |
147 | + GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf" |
148 | +fi |
149 | +STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@" |
150 | + |
151 | +# Create the final classpath. Setting a classpath using the -cp or -classpath option means not to use the |
152 | +# global classpath. Groovy behaves then the same as the java interpreter |
153 | +if [ -n "$CP" ] ; then |
154 | + CP="$CP":. |
155 | +elif [ -n "$CLASSPATH" ] ; then |
156 | + CP="$CLASSPATH":. |
157 | +else |
158 | + CP=. |
159 | +fi |
160 | + |
161 | +# Determine the Java command to use to start the JVM. |
162 | +if [ -z "$JAVACMD" ] ; then |
163 | + if [ -n "$JAVA_HOME" ] ; then |
164 | + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then |
165 | + # IBM's JDK on AIX uses strange locations for the executables |
166 | + JAVACMD="$JAVA_HOME/jre/sh/java" |
167 | + else |
168 | + JAVACMD="$JAVA_HOME/bin/java" |
169 | + fi |
170 | + else |
171 | + JAVACMD="java" |
172 | + fi |
173 | +fi |
174 | +if [ ! -x "$JAVACMD" ] ; then |
175 | + die "JAVA_HOME is not defined correctly, can not execute: $JAVACMD" |
176 | +fi |
177 | +if [ -z "$JAVA_HOME" ] ; then |
178 | + warn "JAVA_HOME environment variable is not set" |
179 | +fi |
180 | + |
181 | +# Increase the maximum file descriptors if we can. |
182 | +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then |
183 | + MAX_FD_LIMIT=`ulimit -H -n` |
184 | + if [ $? -eq 0 ] ; then |
185 | + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then |
186 | + MAX_FD="$MAX_FD_LIMIT" |
187 | + fi |
188 | + ulimit -n $MAX_FD |
189 | + if [ $? -ne 0 ] ; then |
190 | + warn "Could not set maximum file descriptor limit: $MAX_FD" |
191 | + fi |
192 | + else |
193 | + warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT" |
194 | + fi |
195 | +fi |
196 | + |
197 | +# Setup Profiler |
198 | +useprofiler=false |
199 | +if [ "$PROFILER" != "" ] ; then |
200 | + if [ -r "$PROFILER" ] ; then |
201 | + . $PROFILER |
202 | + useprofiler=true |
203 | + else |
204 | + die "Profiler file not found: $PROFILER" |
205 | + fi |
206 | +fi |
207 | + |
208 | +# For Darwin, use classes.jar for TOOLS_JAR |
209 | +TOOLS_JAR="$JAVA_HOME/lib/tools.jar" |
210 | +#if $darwin; then |
211 | +# TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar" |
212 | +#fi |
213 | + |
214 | +# For Darwin, add GROOVY_APP_NAME to the JAVA_OPTS as -Xdock:name |
215 | +if $darwin; then |
216 | + JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GROOVY_APP_NAME -Xdock:icon=$GROOVY_HOME/bin/groovy.icns" |
217 | +fi |
218 | + |
219 | +# For Cygwin, switch paths to Windows format before running java |
220 | +if $cygwin ; then |
221 | + GROOVY_HOME=`cygpath --mixed "$GROOVY_HOME"` |
222 | + JAVA_HOME=`cygpath --mixed "$JAVA_HOME"` |
223 | + GROOVY_CONF=`cygpath --mixed "$GROOVY_CONF"` |
224 | + CP=`cygpath --path --mixed "$CP"` |
225 | + TOOLS_JAR=`cygpath --mixed "$TOOLS_JAR"` |
226 | + STARTER_CLASSPATH=`cygpath --path --mixed "$STARTER_CLASSPATH"` |
227 | + |
228 | + # We build the pattern for arguments to be converted via cygpath |
229 | + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` |
230 | + SEP="" |
231 | + for dir in $ROOTDIRSRAW ; do |
232 | + ROOTDIRS="$ROOTDIRS$SEP$dir" |
233 | + SEP="|" |
234 | + done |
235 | + OURCYGPATTERN="(^($ROOTDIRS))" |
236 | + # Add a user-defined pattern to the cygpath arguments |
237 | + if [ "$GROOVY_CYGPATTERN" != "" ] ; then |
238 | + OURCYGPATTERN="$OURCYGPATTERN|($GROOVY_CYGPATTERN)" |
239 | + fi |
240 | + # Now convert the arguments - kludge to limit ourselves to /bin/sh |
241 | + i=0 |
242 | + for arg in "$@" ; do |
243 | + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` |
244 | + if [ $CHECK -ne 0 ] ; then |
245 | + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` |
246 | + else |
247 | + eval `echo args$i`="\"$arg\"" |
248 | + fi |
249 | + i=`expr $i + 1` |
250 | + done |
251 | + case $i in |
252 | + 0) set -- ;; |
253 | + 1) set -- "$args0" ;; |
254 | + 2) set -- "$args0" "$args1" ;; |
255 | + 3) set -- "$args0" "$args1" "$args2" ;; |
256 | + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; |
257 | + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; |
258 | + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; |
259 | + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; |
260 | + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; |
261 | + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; |
262 | + esac |
263 | + |
264 | +fi |
265 | + |
266 | +startGroovy ( ) { |
267 | + CLASS=$1 |
268 | + shift |
269 | + # Start the Profiler or the JVM |
270 | + if $useprofiler ; then |
271 | + runProfiler |
272 | + else |
273 | + exec "$JAVACMD" $JAVA_OPTS \ |
274 | + -classpath "$STARTER_CLASSPATH" \ |
275 | + -Dscript.name="$SCRIPT_PATH" \ |
276 | + -Dprogram.name="$PROGNAME" \ |
277 | + -Dgroovy.starter.conf="$GROOVY_CONF" \ |
278 | + -Dgroovy.home="$GROOVY_HOME" \ |
279 | + -Dtools.jar="$TOOLS_JAR" \ |
280 | + $STARTER_MAIN_CLASS \ |
281 | + --main $CLASS \ |
282 | + --conf "$GROOVY_CONF" \ |
283 | + --classpath "$CP" \ |
284 | + "$@" |
285 | + fi |
286 | +} |
287 | + |
288 | +STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter |
289 | + |
290 | +lateInit |
291 | |
292 | === added directory '.pc/0002-ant-build.diff.patch' |
293 | === added file '.pc/0002-ant-build.diff.patch/build.xml' |
294 | --- .pc/0002-ant-build.diff.patch/build.xml 1970-01-01 00:00:00 +0000 |
295 | +++ .pc/0002-ant-build.diff.patch/build.xml 2011-02-24 17:57:34 +0000 |
296 | @@ -0,0 +1,902 @@ |
297 | +<?xml version="1.0" encoding="UTF-8"?> |
298 | + |
299 | +<!-- |
300 | +Ant build script for Groovy. |
301 | + |
302 | +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in |
303 | +compliance with the License. You may obtain a copy of the License at |
304 | + |
305 | +http://www.apache.org/licenses/LICENSE-2.0 |
306 | + |
307 | +Unless required by applicable law or agreed to in writing, software distributed under the License is |
308 | +distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
309 | +implied. See the License for the specific language governing permissions and limitations under the License. |
310 | + |
311 | +This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on |
312 | +behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information. |
313 | + |
314 | +Author : Russel Winder |
315 | +Author : Paul King |
316 | +$Revision: 20245 $ ($LastChangedBy: paulk $) |
317 | +$Date: 2010-06-07 02:45:33 +0200 (Mo, 07. Jun 2010) $ |
318 | +--> |
319 | + |
320 | +<project name="Groovy" default="createJars" basedir="."> |
321 | + |
322 | + <property file="local.build.properties"/> |
323 | + <property file="build.properties"/> |
324 | + <property name="ant.requiredVersion" value="1.6.5"/> |
325 | + |
326 | + <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. --> |
327 | + <import file="config/ant/build-maven.xml"/> |
328 | + <import file="config/ant/build-checkstyle.xml"/> |
329 | + <import file="config/ant/build-cobertura.xml"/> |
330 | + |
331 | + <condition property="_skipTests_"> |
332 | + <or> |
333 | + <equals arg1="${test}" arg2="false"/> |
334 | + <istrue value="${skipTests}"/> |
335 | + </or> |
336 | + </condition> |
337 | + |
338 | + <condition property="_skipExamples_"> |
339 | + <istrue value="${skipExamples}"/> |
340 | + </condition> |
341 | + |
342 | + <condition property="_skipDocs_"> |
343 | + <istrue value="${skipDocs}"/> |
344 | + </condition> |
345 | + |
346 | + <condition property="_skipOsgi_"> |
347 | + <istrue value="${skipOsgi}"/> |
348 | + </condition> |
349 | + |
350 | + <condition property="_skipFetch_"> |
351 | + <istrue value="${skipFetch}"/> |
352 | + </condition> |
353 | + |
354 | + <condition property="_skipEmbeddable_"> |
355 | + <istrue value="${skipEmbeddable}"/> |
356 | + </condition> |
357 | + |
358 | + <condition property="_forceServerSettings_"> |
359 | + <istrue value="${forceServerSettings}"/> |
360 | + </condition> |
361 | + |
362 | + <condition property="groovy.build.vm4"> |
363 | + <contains string="${ant.java.version}" substring="1.4"/> |
364 | + </condition> |
365 | + |
366 | + <condition property="groovy.build.vm6"> |
367 | + <contains string="${ant.java.version}" substring="1.6"/> |
368 | + </condition> |
369 | + |
370 | + <presetdef name="javac"> |
371 | + <javac memoryMaximumSize="500m"/> |
372 | + </presetdef> |
373 | + |
374 | + <target name="-initCoverage"> |
375 | + <condition property="_forceCoverage_"> |
376 | + <and> |
377 | + <not> |
378 | + <istrue value="${skipTests}"/> |
379 | + </not> |
380 | + <istrue value="${forceCoverage}"/> |
381 | + </and> |
382 | + </condition> |
383 | + </target> |
384 | + |
385 | + <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date."> |
386 | + <mkdir dir="${groovyParserDirectory}"/> |
387 | + <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}"> |
388 | + <classpath refid="compilePath"/> |
389 | + </antlr> |
390 | + <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}"> |
391 | + <classpath refid="compilePath"/> |
392 | + </antlr> |
393 | + </target> |
394 | + |
395 | + <target name="-init" depends="-fetchDependencies"/> |
396 | + |
397 | + <target name="-banner"> |
398 | + <echo message="Java Runtime Environment version: ${java.version}"/> |
399 | + <echo message="Java Runtime Environment vendor: ${java.vendor}"/> |
400 | + <echo message="Ant version: ${ant.version}"/> |
401 | + <echo message="Operating system name: ${os.name}"/> |
402 | + <echo message="Operating system architecture: ${os.arch}"/> |
403 | + <echo message="Operating system version: ${os.version}"/> |
404 | + <echo message="Base directory: ${basedir}"/> |
405 | + <echo message="Java Home: ${java.home}"/> |
406 | + </target> |
407 | + |
408 | + <target name="-jvm14BuildWarning" if="groovy.build.vm4"> |
409 | + <fail>Aborting! |
410 | + |
411 | +================================================ |
412 | + ERROR: You must build Groovy with a 1.5+ JDK |
413 | +================================================ |
414 | + </fail> |
415 | + </target> |
416 | + |
417 | + <target name="-checkAntVersion" depends="-excludeLegacyAntVersion" |
418 | + description="Check that we are running on the required version of Ant."/> |
419 | + |
420 | + <target name="-excludeLegacyAntVersion"> |
421 | + <!-- antversion didn't exist in early versions of ant so we have |
422 | + a legacy check to provide a nicer error message in this case --> |
423 | + <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+"> |
424 | + <condition> |
425 | + <or> |
426 | + <contains string="${ant.version}" substring="1.1"></contains> |
427 | + <contains string="${ant.version}" substring="1.2"></contains> |
428 | + <contains string="${ant.version}" substring="1.3"></contains> |
429 | + <contains string="${ant.version}" substring="1.4"></contains> |
430 | + <contains string="${ant.version}" substring="1.5"></contains> |
431 | + <and> |
432 | + <contains string="${ant.version}" substring="1.6"></contains> |
433 | + <not> |
434 | + <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains> |
435 | + </not> |
436 | + </and> |
437 | + </or> |
438 | + </condition> |
439 | + </fail> |
440 | + </target> |
441 | + |
442 | + <!-- add back in if we make 1.7+ minimal required version for build again |
443 | + <target name="-ensureRequiredAntVersion"> |
444 | + <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/> |
445 | + <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition> |
446 | + </fail> |
447 | + </target> |
448 | + --> |
449 | + |
450 | + <target name="compileMain" depends="stagedcompile" |
451 | + description="Compile the Java and Groovy code in the main source."> |
452 | + </target> |
453 | + |
454 | + <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber"> |
455 | + <mkdir dir="${mainClassesDirectory}"/> |
456 | + <mkdir dir="${toolsClassesDirectory}"/> |
457 | + <mkdir dir="${mainClassesDirectory}/META-INF"/> |
458 | + |
459 | + <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}" |
460 | + deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath"> |
461 | + <exclude name="groovy/ui/**/*.java"/> |
462 | + </javac> |
463 | + <java classname="org.codehaus.groovy.tools.DgmConverter" |
464 | + fork="yes" |
465 | + failonerror="true"> |
466 | + <classpath refid="compilePath"/> |
467 | + <classpath path="${mainClassesDirectory}"/> |
468 | + </java> |
469 | + <antcall inheritrefs="true" target="-stagedcompile-groovy"/> |
470 | + <antcall target="-includeResources"/> |
471 | + </target> |
472 | + |
473 | + <target name="-stagedcompile-groovy" depends="-initGroovyc"> |
474 | + <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" |
475 | + memorymaximumsize="${groovycMain_mx}"> |
476 | + <classpath> |
477 | + <pathelement path="${mainClassesDirectory}"/> |
478 | + <path refid="compilePath"/> |
479 | + </classpath> |
480 | + <javac deprecation="on" debug="yes" source="1.5" target="1.5"/> |
481 | + </groovyc> |
482 | + </target> |
483 | + |
484 | + <property name="vm5GroovySourceFiles" value="**/*.groovy"/> |
485 | + <property name="vm5JavaSourceFiles" value="**/*.java"/> |
486 | + <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy,org/codehaus/groovy/**/vm6/*Test.groovy"/> |
487 | + |
488 | + <target name="-initGroovyc"> |
489 | + <path id="groovyMainClasses"> |
490 | + <pathelement path="${mainClassesDirectory}"/> |
491 | + <path refid="compilePath"/> |
492 | + </path> |
493 | + <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/> |
494 | + </target> |
495 | + |
496 | + <target name="compileTest" depends="compileMain,compileTestOnly" |
497 | + description="Compile the Java and Groovy code in the test source."/> |
498 | + |
499 | + <target name="-cleanTest"> |
500 | + <delete dir="${testClassesDirectory}"/> |
501 | + </target> |
502 | + |
503 | + <target name="compileTestOnly" unless="_skipTests_"> |
504 | + <mkdir dir="${testClassesDirectory}"/> |
505 | + <antcall inheritrefs="true" target="-compileTest"/> |
506 | + </target> |
507 | + |
508 | + <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6"> |
509 | + <groovyc srcdir="${testSourceDirectory}" |
510 | + destdir="${testClassesDirectory}" |
511 | + includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}" |
512 | + excludes="${vm6GroovySourceFiles}" |
513 | + fork="true" |
514 | + memorymaximumsize="${groovycTest_mx}"> |
515 | + <classpath> |
516 | + <pathelement path="${testClassesDirectory}"/> |
517 | + <path refid="groovyMainClasses"/> |
518 | + <path refid="testLibPath"/> |
519 | + </classpath> |
520 | + <javac source="1.5" target="1.5" nowarn="on"/> |
521 | + </groovyc> |
522 | + </target> |
523 | + |
524 | + <target name="-compileTest_vm6" if="groovy.build.vm6"> |
525 | + <groovyc srcdir="${testSourceDirectory}" |
526 | + destdir="${testClassesDirectory}" |
527 | + includes="${vm6GroovySourceFiles}" |
528 | + fork="true" |
529 | + memorymaximumsize="${groovycTest_mx}"> |
530 | + <classpath> |
531 | + <pathelement path="${testClassesDirectory}"/> |
532 | + <path refid="groovyMainClasses"/> |
533 | + <path refid="testLibPath"/> |
534 | + </classpath> |
535 | + <!-- currently not needed, add in if/when required --> |
536 | + <!--<javac source="1.5" target="1.5" nowarn="on"/>--> |
537 | + </groovyc> |
538 | + </target> |
539 | + |
540 | + <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" |
541 | + unless="_skipExamples_" |
542 | + description="Compile the Java and Groovy code in the examples source directory."> |
543 | + <mkdir dir="${examplesClassesDirectory}"/> |
544 | + <echo message="Compiling example code."/> |
545 | + |
546 | + <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy" |
547 | + destdir="${examplesClassesDirectory}" |
548 | + fork="true" |
549 | + memorymaximumsize="${groovycExamples_mx}"> |
550 | + <classpath> |
551 | + <pathelement path="${mainClassesDirectory}"/> |
552 | + <path refid="compilePath"/> |
553 | + <path refid="examplesPath"/> |
554 | + </classpath> |
555 | + </groovyc> |
556 | + <javac srcdir="${examplesSourceDirectory}" |
557 | + destdir="${examplesClassesDirectory}" |
558 | + source="1.5" |
559 | + target="1.5" |
560 | + fork="true"> |
561 | + <classpath> |
562 | + <pathelement path="${mainClassesDirectory}"/> |
563 | + <pathelement path="${examplesClassesDirectory}"/> |
564 | + <path refid="compilePath"/> |
565 | + <path refid="examplesPath"/> |
566 | + </classpath> |
567 | + </javac> |
568 | + <groovyc srcdir="${examplesSourceDirectory}" |
569 | + destdir="${examplesClassesDirectory}" |
570 | + fork="true" |
571 | + memorymaximumsize="${groovycExamples_mx}" |
572 | + excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java"> |
573 | + <classpath> |
574 | + <pathelement path="${mainClassesDirectory}"/> |
575 | + <pathelement path="${examplesClassesDirectory}"/> |
576 | + <path refid="compilePath"/> |
577 | + <path refid="examplesPath"/> |
578 | + </classpath> |
579 | + <javac source="1.5" target="1.5"/> |
580 | + </groovyc> |
581 | + |
582 | + </target> |
583 | + |
584 | + <target name="-initializeReports"> |
585 | + <mkdir dir="${reportsDirectory}"/> |
586 | + </target> |
587 | + |
588 | + <condition property="_shouldBeHeadless_"> |
589 | + <or> |
590 | + <istrue value="${java.awt.headless}"/> |
591 | + <!--<os name="Mac OS X"/>--> |
592 | + </or> |
593 | + </condition> |
594 | + |
595 | + <target name="-testInit" depends="-initHeadless"> |
596 | + <property name="headlessArg" value=""/> |
597 | + <property name="junitJvmArgs" |
598 | + value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props} -DjavadocAssertion.src.dir=./src/main"/> |
599 | + </target> |
600 | + |
601 | + <target name="-initHeadless" if="_shouldBeHeadless_"> |
602 | + <property name="headlessArg" value="-Djava.awt.headless=true"/> |
603 | + <echo message="Setting headless mode ..."/> |
604 | + </target> |
605 | + |
606 | + <target name="test" |
607 | + depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed" |
608 | + description="Compile and test all the classes (or just one class if testCase property is defined)."/> |
609 | + |
610 | + <target name="clean-test" depends="clean,test" |
611 | + description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/> |
612 | + |
613 | + <condition property="_testOne_"> |
614 | + <and> |
615 | + <not> |
616 | + <istrue value="${_skipTests_}"/> |
617 | + </not> |
618 | + <isset property="testCase"/> |
619 | + </and> |
620 | + </condition> |
621 | + |
622 | + <target name="-testOne" if="_testOne_" depends="-initGroovyc"> |
623 | + <mkdir dir="${junitRawDirectory}"/> |
624 | + <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" |
625 | + maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
626 | + <sysproperty key="apple.awt.UIElement" value="true"/> |
627 | + <!-- keeps the dock from showing the AWT startup --> |
628 | + <jvmarg line="${junitJvmArgs}"/> |
629 | + <test name="${testCase}" todir="${junitRawDirectory}"/> |
630 | + <formatter type="brief" usefile="false"/> |
631 | + <classpath> |
632 | + <pathelement path="${instrumentedClassesDirectory}"/> |
633 | + <pathelement path="src/test"/> |
634 | + <path refid="groovyMainClasses"/> |
635 | + <path refid="testLibPath"/> |
636 | + <pathelement path="${testClassesDirectory}"/> |
637 | + <path refid="coberturaPath"/> |
638 | + </classpath> |
639 | + <assertions> |
640 | + <enable/> |
641 | + </assertions> |
642 | + </junit> |
643 | + </target> |
644 | + |
645 | + <condition property="_testAll_"> |
646 | + <and> |
647 | + <not> |
648 | + <istrue value="${_skipTests_}"/> |
649 | + </not> |
650 | + <not> |
651 | + <isset property="_testOne_"/> |
652 | + </not> |
653 | + </and> |
654 | + </condition> |
655 | + |
656 | + <target name="-collectOptionalTests"> |
657 | + <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-"> |
658 | + <istrue value="${junit.network}"/> |
659 | + </condition> |
660 | + <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/> |
661 | + </target> |
662 | + |
663 | + <target name="-collect15tests" unless="groovy.build.vm6"> |
664 | + <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class"/> |
665 | + </target> |
666 | + |
667 | + <target name="-collect16tests" if="groovy.build.vm6"> |
668 | + <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class"/> |
669 | + </target> |
670 | + |
671 | + <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc"> |
672 | + <mkdir dir="${junitRawDirectory}"/> |
673 | + <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" |
674 | + maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
675 | + <jvmarg line="${junitJvmArgs}"/> |
676 | + <sysproperty key="apple.awt.UIElement" value="true"/> |
677 | + <!-- keeps the dock from showing the AWT startup --> |
678 | + <formatter type="xml"/> |
679 | + <formatter type="plain" unless="noTextReports"/> |
680 | + <batchtest todir="${junitRawDirectory}"> |
681 | + <fileset refid="ubertests.fileset"/> |
682 | + <fileset refid="optionalTests.fileset"/> |
683 | + </batchtest> |
684 | + <classpath> |
685 | + <pathelement path="${instrumentedClassesDirectory}"/> |
686 | + <pathelement path="src/test"/> |
687 | + <path refid="groovyMainClasses"/> |
688 | + <path refid="testLibPath"/> |
689 | + <pathelement path="${testClassesDirectory}"/> |
690 | + <path refid="coberturaPath"/> |
691 | + </classpath> |
692 | + <assertions> |
693 | + <enable/> |
694 | + </assertions> |
695 | + </junit> |
696 | + <mkdir dir="${junitReportsDirectory}"/> |
697 | + <junitreport tofile="${junitRawDirectory}/Results.xml"> |
698 | + <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/> |
699 | + <report format="frames" todir="${junitReportsDirectory}"/> |
700 | + </junitreport> |
701 | + </target> |
702 | + |
703 | + <target name="-reportTestFailed" depends="-coverageReport" if="testFailed"> |
704 | + <fail message="Test failed, not processing further targets."/> |
705 | + </target> |
706 | + |
707 | + <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_"> |
708 | + <mkdir dir="${instrumentedClassesDirectory}"/> |
709 | + <coberturaInstrument classesDirectory="${mainClassesDirectory}"/> |
710 | + </target> |
711 | + |
712 | + <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_"> |
713 | + <coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/> |
714 | + </target> |
715 | + |
716 | + <target name="-actuallyCreateJars" |
717 | + depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar" |
718 | + unless="testFailed"/> |
719 | + |
720 | + <target name="-makeManifest"> |
721 | + <mkdir dir="${mainClassesDirectory}/META-INF"/> |
722 | + <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/> |
723 | + <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
724 | + </target> |
725 | + |
726 | + <macrodef name="makeManifest"> |
727 | + <attribute name="file"/> |
728 | + <attribute name="bundleEnvironment" default="J2SE-1.5"/> |
729 | + <sequential> |
730 | + <manifest file="@{file}"> |
731 | + <attribute name="Built-By" value="${user.name}"/> |
732 | + <attribute name="Extension-Name" value="groovy"/> |
733 | + <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
734 | + <attribute name="Specification-Version" value="${groovyVersion}"/> |
735 | + <attribute name="Specification-Vendor" value="The Codehaus"/> |
736 | + <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
737 | + <attribute name="Implementation-Version" value="${groovyVersion}"/> |
738 | + <attribute name="Implementation-Vendor" value="The Codehaus"/> |
739 | + <attribute name="Bundle-ManifestVersion" value="2"/> |
740 | + <attribute name="Bundle-Name" value="Groovy Runtime"/> |
741 | + <attribute name="Bundle-Description" value="Groovy Runtime"/> |
742 | + <attribute name="Bundle-Version" value="${groovyBundleVersion}"/> |
743 | + <attribute name="Bundle-Vendor" value="The Codehaus"/> |
744 | + <attribute name="Bundle-ClassPath" value="."/> |
745 | + <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}"/> |
746 | + <attribute name="Eclipse-BuddyPolicy" value="dependent"/> |
747 | + <attribute name="Eclipse-LazyStart" value="true"/> |
748 | + <attribute name="DynamicImport-Package" value="*"/> |
749 | + </manifest> |
750 | + </sequential> |
751 | + </macrodef> |
752 | + |
753 | + <target name="-includeResources" depends="-includeGroovyDocTemplates"> |
754 | + <copy todir="${mainClassesDirectory}"> |
755 | + <fileset dir="${mainSourceDirectory}"> |
756 | + <include name="META-INF/services/*"/> |
757 | + <include name="groovy/grape/*.xml"/> |
758 | + <include name="groovy/ui/*.properties"/> |
759 | + <include name="groovy/ui/**/*.png"/> |
760 | + <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/> |
761 | + <include name="org/codehaus/groovy/tools/shell/**/*.properties"/> |
762 | + <include name="org/codehaus/groovy/tools/groovydoc/**/*.properties"/> |
763 | + <include name="org/codehaus/groovy/tools/shell/**/*.xml"/> |
764 | + <include name="org/codehaus/groovy/antlib.xml"/> |
765 | + </fileset> |
766 | + </copy> |
767 | + <antcall target="-includeReleaseInfo"/> |
768 | + </target> |
769 | + |
770 | + <target name="-includeReleaseInfo"> |
771 | + <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" |
772 | + todir="${mainClassesDirectory}/META-INF" overwrite="true"> |
773 | + </copy> |
774 | + <tstamp> |
775 | + <format property="release.date" pattern="dd-MMM-yyyy"/> |
776 | + <format property="release.time" pattern="hh:mm aa"/> |
777 | + </tstamp> |
778 | + <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties"> |
779 | + <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/> |
780 | + <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/> |
781 | + <replacefilter token="##BuildDate##" value="${release.date}"/> |
782 | + <replacefilter token="##BuildTime##" value="${release.time}"/> |
783 | + </replace> |
784 | + </target> |
785 | + |
786 | + <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates"> |
787 | + <copy todir="${examplesClassesDirectory}"> |
788 | + <fileset dir="${examplesSourceDirectory}"> |
789 | + <include name="/swing/binding/caricature/resources/*.gif"/> |
790 | + </fileset> |
791 | + </copy> |
792 | + </target> |
793 | + |
794 | + <target name="-includeGroovyDocTemplates"> |
795 | + <copy todir="${mainClassesDirectory}"> |
796 | + <fileset dir="${mainSourceDirectory}"> |
797 | + <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/*/*.*"/> |
798 | + </fileset> |
799 | + <fileset dir="${toolsSourceDirectory}"> |
800 | + <include name="org/codehaus/groovy/tools/groovy.ico"/> |
801 | + </fileset> |
802 | + </copy> |
803 | + </target> |
804 | + |
805 | + <target name="-initializeJars" depends="test" unless="_skipDocs_"> |
806 | + <delete dir="${targetDistDirectory}" quiet="true"/> |
807 | + <mkdir dir="${targetDistDirectory}"/> |
808 | + </target> |
809 | + |
810 | + <target name="-createBaseJar" unless="testFailed"> |
811 | + <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}" |
812 | + excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
813 | + <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/> |
814 | + </target> |
815 | + |
816 | + <target name="-jarjarInit" unless="_skipEmbeddable_"> |
817 | + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/> |
818 | + </target> |
819 | + |
820 | + <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/> |
821 | + |
822 | + <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_"> |
823 | + <delete dir="${stagingDirectory}" quiet="true"/> |
824 | + <mkdir dir="${stagingDirectory}"/> |
825 | + <unzip dest="${stagingDirectory}"> |
826 | + <fileset dir="${runtimeLibDirectory}"> |
827 | + <include name="antlr*.jar"/> |
828 | + <include name="asm*.jar"/> |
829 | + <exclude name="asm-attr*.jar"/> |
830 | + <exclude name="asm-util*.jar"/> |
831 | + <exclude name="asm-analysis*.jar"/> |
832 | + </fileset> |
833 | + </unzip> |
834 | + <unzip dest="${stagingDirectory}"> |
835 | + <fileset dir="${targetDistDirectory}"> |
836 | + <include name="groovy.jar"/> |
837 | + </fileset> |
838 | + </unzip> |
839 | + <copy toDir="${stagingDirectory}/META-INF"> |
840 | + <fileset dir="${basedir}/config/build"> |
841 | + <include name="*LICENSE.txt"/> |
842 | + </fileset> |
843 | + </copy> |
844 | + <!-- add commons-cli --> |
845 | + <unzip dest="${stagingDirectory}"> |
846 | + <patternset> |
847 | + <!-- no need for the manifest file, we have our own --> |
848 | + <exclude name="META-INF/MANIFEST.MF"/> |
849 | + </patternset> |
850 | + <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/> |
851 | + <fileset dir="${runtimeLibDirectory}"> |
852 | + <include name="commons-cli-*.jar"/> |
853 | + </fileset> |
854 | + </unzip> |
855 | + <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/> |
856 | + <!-- TODO try to make use of jarjar keep ability --> |
857 | + <jarjar jarfile="${targetDistDirectory}/groovy-all.jar" |
858 | + manifest="${stagingDirectory}/META-INF/MANIFEST.MF"> |
859 | + <fileset dir="${stagingDirectory}" |
860 | + excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
861 | + <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/> |
862 | + <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/> |
863 | + <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/> |
864 | + </jarjar> |
865 | + <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true" |
866 | + basedir="${stagingDirectory}" |
867 | + includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
868 | + |
869 | + <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" |
870 | + tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/> |
871 | + <delete dir="${stagingDirectory}" quiet="true"/> |
872 | + </target> |
873 | + |
874 | + <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars" |
875 | + description="Build Groovy and create the jarfiles."/> |
876 | + |
877 | + <target name="updateJarsForOsgi" unless="_skipOsgi_"> |
878 | + <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/> |
879 | + <copy todir="${targetDistDirectory}"> |
880 | + <fileset dir="config/bnd" includes="groovy*.bnd"/> |
881 | + <filterset> |
882 | + <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/> |
883 | + </filterset> |
884 | + </copy> |
885 | + <property name="jarsToWrap" value="groovy.jar,groovy-all.jar"/> |
886 | + <property name="runtimeJars" refid="runtimePath"/> |
887 | + <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true" |
888 | + classpath="${runtimeJars}"> |
889 | + <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
890 | + </bndwrap> |
891 | + <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
892 | + <move todir="${targetDistDirectory}"> |
893 | + <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/> |
894 | + <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/> |
895 | + </move> |
896 | + <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/> |
897 | + </target> |
898 | + |
899 | + <target name="skipOsgi" if="_skipOsgi_"> |
900 | + <move todir="${targetDistDirectory}"> |
901 | + <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/> |
902 | + <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/> |
903 | + </move> |
904 | + </target> |
905 | + |
906 | + <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed" |
907 | + description="Create an installation hierarchy in target/install."> |
908 | + |
909 | + <!-- |
910 | + FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools) |
911 | + ability to run faster incremental builds. |
912 | + --> |
913 | + <delete dir="${installDirectory}" quiet="true"/> |
914 | + <mkdir dir="${installDirectory}"/> |
915 | + |
916 | + <!-- Install license files --> |
917 | + <copy todir="${installDirectory}"> |
918 | + <fileset dir="${basedir}"> |
919 | + <include name="LICENSE.txt"/> |
920 | + <include name="NOTICE.txt"/> |
921 | + </fileset> |
922 | + </copy> |
923 | + <unzip dest="${installDirectory}"> |
924 | + <patternset> |
925 | + <include name="META-INF/*-LICENSE.txt"/> |
926 | + </patternset> |
927 | + <mapper type="flatten"/> |
928 | + <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/> |
929 | + </unzip> |
930 | + <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/> |
931 | + |
932 | + <!-- Install generated artifacts and runtime dependencies --> |
933 | + <mkdir dir="${installDirectory}/lib"/> |
934 | + <copy todir="${installDirectory}/lib"> |
935 | + <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/> |
936 | + <fileset dir="${runtimeLibDirectory}" includes="*.jar"/> |
937 | + </copy> |
938 | + |
939 | + <!-- Install the embeddable bits --> |
940 | + <mkdir dir="${installDirectory}/embeddable"/> |
941 | + <copy todir="${installDirectory}/embeddable"> |
942 | + <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/> |
943 | + </copy> |
944 | + |
945 | + <!-- Install configuration files --> |
946 | + <mkdir dir="${installDirectory}/conf"/> |
947 | + <copy toDir="${installDirectory}/conf"> |
948 | + <fileset dir="${sourceDirectory}/conf" includes="*"/> |
949 | + </copy> |
950 | + |
951 | + <!-- Install scripts --> |
952 | + <mkdir dir="${installDirectory}/bin"/> |
953 | + <copy toDir="${installDirectory}/bin"> |
954 | + <fileset dir="${sourceDirectory}/bin" includes="*"/> |
955 | + <filterset> |
956 | + <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/> |
957 | + </filterset> |
958 | + </copy> |
959 | + <!-- icon --> |
960 | + <copy todir="${installDirectory}/bin" flatten="true"> |
961 | + <fileset dir="${toolsSourceDirectory}"> |
962 | + <include name="org/codehaus/groovy/tools/groovy.ico"/> |
963 | + </fileset> |
964 | + </copy> |
965 | + |
966 | + <!-- Tweak scripts for platform compatibility --> |
967 | + <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat, *.icns"/> |
968 | + <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/> |
969 | + <chmod perm="ugo+x"> |
970 | + <fileset dir="${installDirectory}/bin" includes="*,*.*"/> |
971 | + </chmod> |
972 | + </target> |
973 | + |
974 | + <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit" |
975 | + description="Create the code style reports."> |
976 | + <checkAndReport |
977 | + reportDirectory="${reportsDirectory}/checkstyle" |
978 | + sourceDirectory="${mainSourceDirectory}" |
979 | + excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java"> |
980 | + <path> |
981 | + <pathelement path="${mainClassesDirectory}"/> |
982 | + <path refid="testLibPath"/> |
983 | + </path> |
984 | + </checkAndReport> |
985 | + </target> |
986 | + |
987 | + <target name="-compileTools" depends="-initGroovyc,compileMain"> |
988 | + <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true"> |
989 | + <classpath> |
990 | + <path refid="toolsPath"/> |
991 | + <pathelement path="${mainClassesDirectory}"/> |
992 | + <path refid="compilePath"/> |
993 | + </classpath> |
994 | + </groovyc> |
995 | + <copy todir="${toolsClassesDirectory}"> |
996 | + <fileset dir="${toolsSourceDirectory}"> |
997 | + <include name="**/*.html"/> |
998 | + </fileset> |
999 | + </copy> |
1000 | + </target> |
1001 | + |
1002 | + <target name="cruiseReportExtras"> |
1003 | + <mkdir dir="${cruiseReportRootDirectory}"/> |
1004 | + <copy todir="${cruiseReportRootDirectory}"> |
1005 | + <fileset dir="cruise/html"/> |
1006 | + </copy> |
1007 | + </target> |
1008 | + |
1009 | + <target name="cruiseInit"> |
1010 | + <property name="noTextReports" value="true"/> |
1011 | + <property name="forceCoverage" value="true"/> |
1012 | + <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/> |
1013 | + <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/> |
1014 | + </target> |
1015 | + |
1016 | + <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/> |
1017 | + |
1018 | + <target name="-docInit"> |
1019 | + <mkdir dir="${docsDirectory}"/> |
1020 | + <property name="docFooter" value="Copyright &copy; 2003-2010 The Codehaus. All rights reserved."/> |
1021 | + <property name="title" value="Groovy ${groovyVersion}"/> |
1022 | + </target> |
1023 | + |
1024 | + <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/> |
1025 | + |
1026 | + <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars" |
1027 | + unless="_skipDocs_" description="Create the javadoc documentation."> |
1028 | + <javadoc destdir="${docsDirectory}/api" author="true" version="true" |
1029 | + windowtitle="${title}" doctitle="${title}" |
1030 | + encoding="ISO-8859-1" useexternalfile="true" source="1.5" |
1031 | + footer="${docFooter}" |
1032 | + overview="src/main/overviewj.html" |
1033 | + maxmemory="${javaDoc_mx}" |
1034 | + > |
1035 | + <classpath> |
1036 | + <path path="${mainClassesDirectory}"/> |
1037 | + <path refid="compilePath"/> |
1038 | + </classpath> |
1039 | + <fileset dir="${mainSourceDirectory}" includes="**/*.java"/> |
1040 | + <link href="http://java.sun.com/javase/6/docs/api"/> |
1041 | + <link href="http://www.dpml.net/api/ant/1.7.0"/> |
1042 | + <link href="http://junit.sourceforge.net/junit3.8.1/javadoc"/> |
1043 | + <link href="http://java.sun.com/j2ee/1.4/docs/api"/> |
1044 | + <link href="http://www.antlr2.org/javadoc"/> |
1045 | + <link href="http://commons.apache.org/cli/api-release"/> |
1046 | + </javadoc> |
1047 | + <mkdir dir="${targetDistDirectory}"/> |
1048 | + <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
1049 | + <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar"> |
1050 | + <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
1051 | + </copy> |
1052 | + </target> |
1053 | + |
1054 | + <target name="groovydoc" depends="-fetchDependencies" unless="_skipDocs_"> |
1055 | + <path id="groovydocpath"> |
1056 | + <path path="${mainClassesDirectory}"/> |
1057 | + <path refid="runtimePath"/> |
1058 | + </path> |
1059 | + <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/> |
1060 | + </target> |
1061 | + |
1062 | + <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK"> |
1063 | + <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc"> |
1064 | + <classpath> |
1065 | + <path path="${mainClassesDirectory}"/> |
1066 | + <path refid="compilePath"/> |
1067 | + </classpath> |
1068 | + </taskdef> |
1069 | + <groovydoc |
1070 | + destdir="${docsDirectory}/gapi" |
1071 | + sourcepath="${mainSourceDirectory}" |
1072 | + packagenames="**.*" |
1073 | + use="true" |
1074 | + windowtitle="${title}" |
1075 | + doctitle="${title}" |
1076 | + header="${title}" |
1077 | + footer="${docFooter}" |
1078 | + overview="src/main/overview.html"> |
1079 | + <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/> |
1080 | + <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/javase/6/docs/api"/> |
1081 | + <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/> |
1082 | + <link packages="org.junit.,junit." href="http://junit.sourceforge.net/junit3.8.1/javadoc"/> |
1083 | + <link packages="org.apache.commons.cli." href="http://commons.apache.org/cli/api-release"/> |
1084 | + <link packages="antlr." href="http://www.antlr2.org/javadoc"/> |
1085 | + </groovydoc> |
1086 | + </target> |
1087 | + |
1088 | + <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation"> |
1089 | + <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true"> |
1090 | + <classpath> |
1091 | + <pathelement path="${toolsClassesDirectory}"/> |
1092 | + <path refid="toolsPath"/> |
1093 | + <pathelement path="${mainClassesDirectory}"/> |
1094 | + </classpath> |
1095 | + <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/> |
1096 | + <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/> |
1097 | + <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/> |
1098 | + <arg value="org.codehaus.groovy.runtime.XmlGroovyMethods"/> |
1099 | + <arg value="org.codehaus.groovy.runtime.EncodingGroovyMethods"/> |
1100 | + <arg value="org.codehaus.groovy.runtime.DateGroovyMethods"/> |
1101 | + <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/> |
1102 | + <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/> |
1103 | + <arg value="org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods"/> |
1104 | + </java> |
1105 | + <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/> |
1106 | + <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/> |
1107 | + </target> |
1108 | + |
1109 | + <target name="clean" description="Clean up build artifacts."> |
1110 | + <delete dir="${targetDirectory}" quiet="true"/> |
1111 | + <delete file="cobertura.ser" quiet="true" failonerror="false"/> |
1112 | + <delete quiet="true"> |
1113 | + <fileset dir="." includes="**/*~"/> |
1114 | + <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/> |
1115 | + <fileset dir="${javaParserDirectory}" |
1116 | + includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/> |
1117 | + </delete> |
1118 | + </target> |
1119 | + |
1120 | + <target name="deploy" depends="-mavenDeployInit,install,doc,-deployDefault,-deployFromServer" |
1121 | + description="Deploy jars to maven repository."/> |
1122 | + |
1123 | + <target name="-deployDefault" unless="_forceServerSettings_"> |
1124 | + <mavenDeploy version="${groovyVersion}" prefix="groovy"/> |
1125 | + <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/> |
1126 | + </target> |
1127 | + |
1128 | + <target name="-deployFromServer" if="_forceServerSettings_"> |
1129 | + <copy tofile="target/settings.xml"> |
1130 | + <fileset file="config/maven/settings.xml"/> |
1131 | + <filterset> |
1132 | + <filter token="groovy.deploy.username" value="${groovy.deploy.username}"/> |
1133 | + <filter token="groovy.deploy.password" value="${groovy.deploy.password}"/> |
1134 | + </filterset> |
1135 | + </copy> |
1136 | + <mavenDeploySettings version="${groovyVersion}" prefix="groovy" settings="target/settings.xml"/> |
1137 | + <mavenDeploySettings version="${groovyVersion}" prefix="groovy-all" settings="target/settings.xml"/> |
1138 | + <delete file="target/settings.xml"/> |
1139 | + </target> |
1140 | + |
1141 | + <target name="installRepo" depends="-mavenInit,install,doc" |
1142 | + description="Deploy artifacts to local maven repository."> |
1143 | + <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/> |
1144 | + <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/> |
1145 | + </target> |
1146 | + |
1147 | + <target name="quality" depends="install,checkstyle" description="install plus checkstyle"/> |
1148 | + |
1149 | + <target name="release" depends="deploy,compileExamples" description="deploy plus compileExamples"/> |
1150 | + |
1151 | + <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/> |
1152 | + |
1153 | + <target name="dist" depends="install,doc" description="Create everything needed for a distribution."> |
1154 | + <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip" |
1155 | + comment="The Groovy ${groovyVersion} binary distribution."> |
1156 | + |
1157 | + <!-- Make unix scripts executable --> |
1158 | + <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775"> |
1159 | + <include name="bin/*"/> |
1160 | + <exclude name="bin/*.*"/> |
1161 | + <exclude name="bin/startGroovy*"/> |
1162 | + </zipfileset> |
1163 | + |
1164 | + <!-- Include the other scripts as is --> |
1165 | + <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
1166 | + <include name="bin/*.*"/> |
1167 | + <include name="bin/startGroovy*"/> |
1168 | + </zipfileset> |
1169 | + |
1170 | + <!-- Include everything else as is too --> |
1171 | + <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
1172 | + <exclude name="bin/**"/> |
1173 | + <include name="**"/> |
1174 | + </zipfileset> |
1175 | + </zip> |
1176 | + |
1177 | + <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip" |
1178 | + comment="The Groovy ${groovyVersion} documentation distribution."> |
1179 | + <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/> |
1180 | + <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/> |
1181 | + </zip> |
1182 | + |
1183 | + <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip" |
1184 | + comment="The Groovy ${groovyVersion} source distribution."> |
1185 | + <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}"> |
1186 | + <!-- Exclude generated bits as well as any other bits that shouldn't make it in --> |
1187 | + <exclude name="${targetDirectory}/**"/> |
1188 | + <exclude name="classes/**"/> |
1189 | + <exclude name="cruise/**"/> |
1190 | + <exclude name=".clover/*"/> |
1191 | + <exclude name="local.build.properties"/> |
1192 | + <exclude name="cobertura.ser"/> |
1193 | + <exclude name="junitvmwatcher*.properties"/> |
1194 | + </zipfileset> |
1195 | + </zip> |
1196 | + </target> |
1197 | + |
1198 | +</project> |
1199 | |
1200 | === added directory '.pc/0002-ant-build.diff.patch/config' |
1201 | === added directory '.pc/0002-ant-build.diff.patch/config/ant' |
1202 | === added file '.pc/0002-ant-build.diff.patch/config/ant/build-setup.xml' |
1203 | --- .pc/0002-ant-build.diff.patch/config/ant/build-setup.xml 1970-01-01 00:00:00 +0000 |
1204 | +++ .pc/0002-ant-build.diff.patch/config/ant/build-setup.xml 2011-02-24 17:57:34 +0000 |
1205 | @@ -0,0 +1,78 @@ |
1206 | +<?xml version="1.0"?> |
1207 | + |
1208 | +<!-- |
1209 | +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in |
1210 | +compliance with the License. You may obtain a copy of the License at |
1211 | + |
1212 | +http://www.apache.org/licenses/LICENSE-2.0 |
1213 | + |
1214 | +Unless required by applicable law or agreed to in writing, software distributed under the License is |
1215 | +distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
1216 | +implied. See the License for the specific language governing permissions and limitations under the License. |
1217 | + |
1218 | +This work is copyright by the author(s) and is part of a greater work collectively copyright by the |
1219 | +Groovy community. See the NOTICE.txt file distributed with this work for additional information. |
1220 | + |
1221 | +Author : Paul King |
1222 | +$Revision: 5519 $ ($LastChangedBy: paulk $) |
1223 | +$Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $ |
1224 | +--> |
1225 | + |
1226 | +<project name="build-setup" default="" basedir="../.."> |
1227 | + |
1228 | + <property name="bootstrapDirectory" location="bootstrap"/> |
1229 | + <property name="sourceDirectory" value="src"/> |
1230 | + <property name="wikiPdfDirectory" value="src"/> |
1231 | + <property name="mainSourceDirectory" location="${sourceDirectory}/main"/> |
1232 | + <property name="testSourceDirectory" value="${sourceDirectory}/test"/> |
1233 | + <property name="toolsSourceDirectory" location="${sourceDirectory}/tools"/> |
1234 | + <property name="examplesSourceDirectory" location="${sourceDirectory}/examples"/> |
1235 | + |
1236 | + <property name="targetDirectory" value="target"/> |
1237 | + <property name="installDirectory" value="${targetDirectory}/install"/> |
1238 | + <property name="cruiseReportRootDirectory" value="${targetDirectory}/root"/> |
1239 | + <property name="stagingDirectory" value="${targetDirectory}/staging"/> |
1240 | + <property name="docsDirectory" value="${targetDirectory}/html"/> |
1241 | + <property name="mainClassesDirectory" value="${targetDirectory}/classes"/> |
1242 | + <property name="testClassesDirectory" value="${targetDirectory}/test-classes"/> |
1243 | + <property name="toolsClassesDirectory" value="${targetDirectory}/tools-classes"/> |
1244 | + <property name="mainStubsDirectory" value="${targetDirectory}/stubs"/> |
1245 | + <property name="testStubsDirectory" value="${targetDirectory}/test-stubs"/> |
1246 | + |
1247 | + <property name="examplesClassesDirectory" value="${targetDirectory}/examples-classes"/> |
1248 | + <property name="instrumentedClassesDirectory" value="${targetDirectory}/instrumented-classes"/> |
1249 | + <property name="reportsDirectory" value="${targetDirectory}/reports"/> |
1250 | + <property name="targetLibDirectory" value="${targetDirectory}/lib"/> |
1251 | + <property name="targetDistDirectory" value="${targetDirectory}/dist"/> |
1252 | + |
1253 | + <property name="antlrDirectory" value="${mainSourceDirectory}/org/codehaus/groovy/antlr"/> |
1254 | + <property name="groovyParserDirectory" value="${antlrDirectory}/parser"/> |
1255 | + <property name="javaParserDirectory" value="${antlrDirectory}/java"/> |
1256 | + |
1257 | + <property name="compileLibDirectory" value="${targetLibDirectory}/compile"/> |
1258 | + <property name="testLibDirectory" value="${targetLibDirectory}/test"/> |
1259 | + <property name="runtimeLibDirectory" value="${targetLibDirectory}/runtime"/> |
1260 | + <property name="toolsLibDirectory" value="${targetLibDirectory}/tools"/> |
1261 | + <property name="examplesLibDirectory" value="${targetLibDirectory}/examples"/> |
1262 | + <property name="extrasLibDirectory" value="${targetLibDirectory}/extras"/> |
1263 | + <property name="junitRawDirectory" value="${targetDirectory}/test-reports"/> |
1264 | + <property name="junitReportsDirectory" value="${reportsDirectory}/junit"/> |
1265 | + <property name="relativePathToRealBasedir" value="."/> |
1266 | + |
1267 | + <macrodef name="antforked"> |
1268 | + <attribute name="target"/> |
1269 | + <attribute name="maxmemory" default="256m"/> |
1270 | + <attribute name="classpathref" default="runtimePath"/> |
1271 | + <sequential> |
1272 | + <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true"> |
1273 | + <classpath refid="@{classpathref}"/> |
1274 | + <jvmarg value="-Duser.home=${user.home}" /> |
1275 | + <arg value="@{target}"/> |
1276 | + <arg value="-DskipFetch=${skipFetch}"/> |
1277 | + <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/> |
1278 | + <arg value="-DtoolsLibDirectory=${toolsLibDirectory}" /> |
1279 | + </java> |
1280 | + </sequential> |
1281 | + </macrodef> |
1282 | + |
1283 | +</project> |
1284 | |
1285 | === added directory '.pc/0003-disable-bnd.diff.patch' |
1286 | === added file '.pc/0003-disable-bnd.diff.patch/build.xml' |
1287 | --- .pc/0003-disable-bnd.diff.patch/build.xml 1970-01-01 00:00:00 +0000 |
1288 | +++ .pc/0003-disable-bnd.diff.patch/build.xml 2011-02-24 17:57:34 +0000 |
1289 | @@ -0,0 +1,910 @@ |
1290 | +<?xml version="1.0" encoding="UTF-8"?> |
1291 | + |
1292 | +<!-- |
1293 | +Ant build script for Groovy. |
1294 | + |
1295 | +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in |
1296 | +compliance with the License. You may obtain a copy of the License at |
1297 | + |
1298 | +http://www.apache.org/licenses/LICENSE-2.0 |
1299 | + |
1300 | +Unless required by applicable law or agreed to in writing, software distributed under the License is |
1301 | +distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
1302 | +implied. See the License for the specific language governing permissions and limitations under the License. |
1303 | + |
1304 | +This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on |
1305 | +behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information. |
1306 | + |
1307 | +Author : Russel Winder |
1308 | +Author : Paul King |
1309 | +$Revision: 20245 $ ($LastChangedBy: paulk $) |
1310 | +$Date: 2010-06-07 02:45:33 +0200 (Mo, 07. Jun 2010) $ |
1311 | +--> |
1312 | + |
1313 | +<project name="Groovy" default="createJars" basedir="."> |
1314 | + |
1315 | + <property file="local.build.properties"/> |
1316 | + <property file="build.properties"/> |
1317 | + <property name="ant.requiredVersion" value="1.6.5"/> |
1318 | + |
1319 | + <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. --> |
1320 | + <import file="config/ant/build-setup.xml"/> |
1321 | + <import file="config/ant/build-checkstyle.xml"/> |
1322 | + <import file="config/ant/build-cobertura.xml"/> |
1323 | + |
1324 | + <path id="compilePath"> |
1325 | + <path path="${java.class.path}" /> |
1326 | + </path> |
1327 | + <path id="toolsPath"> |
1328 | + <path path="${java.class.path}" /> |
1329 | + </path> |
1330 | + |
1331 | + <condition property="_skipTests_"> |
1332 | + <or> |
1333 | + <equals arg1="${test}" arg2="false"/> |
1334 | + <istrue value="${skipTests}"/> |
1335 | + </or> |
1336 | + </condition> |
1337 | + |
1338 | + <condition property="_skipExamples_"> |
1339 | + <istrue value="${skipExamples}"/> |
1340 | + </condition> |
1341 | + |
1342 | + <condition property="_skipDocs_"> |
1343 | + <istrue value="${skipDocs}"/> |
1344 | + </condition> |
1345 | + |
1346 | + <condition property="_skipOsgi_"> |
1347 | + <istrue value="${skipOsgi}"/> |
1348 | + </condition> |
1349 | + |
1350 | + <condition property="_skipFetch_"> |
1351 | + <istrue value="${skipFetch}"/> |
1352 | + </condition> |
1353 | + |
1354 | + <condition property="_skipEmbeddable_"> |
1355 | + <istrue value="${skipEmbeddable}"/> |
1356 | + </condition> |
1357 | + |
1358 | + <condition property="_forceServerSettings_"> |
1359 | + <istrue value="${forceServerSettings}"/> |
1360 | + </condition> |
1361 | + |
1362 | + <condition property="groovy.build.vm4"> |
1363 | + <contains string="${ant.java.version}" substring="1.4"/> |
1364 | + </condition> |
1365 | + |
1366 | + <condition property="groovy.build.vm6"> |
1367 | + <contains string="${ant.java.version}" substring="1.6"/> |
1368 | + </condition> |
1369 | + |
1370 | + <presetdef name="javac"> |
1371 | + <javac memoryMaximumSize="500m"/> |
1372 | + </presetdef> |
1373 | + |
1374 | + <target name="-initCoverage"> |
1375 | + <condition property="_forceCoverage_"> |
1376 | + <and> |
1377 | + <not> |
1378 | + <istrue value="${skipTests}"/> |
1379 | + </not> |
1380 | + <istrue value="${forceCoverage}"/> |
1381 | + </and> |
1382 | + </condition> |
1383 | + </target> |
1384 | + |
1385 | + <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date."> |
1386 | + <mkdir dir="${groovyParserDirectory}"/> |
1387 | + <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}"> |
1388 | + <classpath refid="compilePath"/> |
1389 | + </antlr> |
1390 | + <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}"> |
1391 | + <classpath refid="compilePath"/> |
1392 | + </antlr> |
1393 | + </target> |
1394 | + |
1395 | + <target name="-init"> |
1396 | + <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/> |
1397 | + </target> |
1398 | + |
1399 | + <target name="-banner"> |
1400 | + <echo message="Java Runtime Environment version: ${java.version}"/> |
1401 | + <echo message="Java Runtime Environment vendor: ${java.vendor}"/> |
1402 | + <echo message="Ant version: ${ant.version}"/> |
1403 | + <echo message="Operating system name: ${os.name}"/> |
1404 | + <echo message="Operating system architecture: ${os.arch}"/> |
1405 | + <echo message="Operating system version: ${os.version}"/> |
1406 | + <echo message="Base directory: ${basedir}"/> |
1407 | + <echo message="Java Home: ${java.home}"/> |
1408 | + </target> |
1409 | + |
1410 | + <target name="-jvm14BuildWarning" if="groovy.build.vm4"> |
1411 | + <fail>Aborting! |
1412 | + |
1413 | +================================================ |
1414 | + ERROR: You must build Groovy with a 1.5+ JDK |
1415 | +================================================ |
1416 | + </fail> |
1417 | + </target> |
1418 | + |
1419 | + <target name="-checkAntVersion" depends="-excludeLegacyAntVersion" |
1420 | + description="Check that we are running on the required version of Ant."/> |
1421 | + |
1422 | + <target name="-excludeLegacyAntVersion"> |
1423 | + <!-- antversion didn't exist in early versions of ant so we have |
1424 | + a legacy check to provide a nicer error message in this case --> |
1425 | + <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+"> |
1426 | + <condition> |
1427 | + <or> |
1428 | + <contains string="${ant.version}" substring="1.1"></contains> |
1429 | + <contains string="${ant.version}" substring="1.2"></contains> |
1430 | + <contains string="${ant.version}" substring="1.3"></contains> |
1431 | + <contains string="${ant.version}" substring="1.4"></contains> |
1432 | + <contains string="${ant.version}" substring="1.5"></contains> |
1433 | + <and> |
1434 | + <contains string="${ant.version}" substring="1.6"></contains> |
1435 | + <not> |
1436 | + <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains> |
1437 | + </not> |
1438 | + </and> |
1439 | + </or> |
1440 | + </condition> |
1441 | + </fail> |
1442 | + </target> |
1443 | + |
1444 | + <!-- add back in if we make 1.7+ minimal required version for build again |
1445 | + <target name="-ensureRequiredAntVersion"> |
1446 | + <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/> |
1447 | + <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition> |
1448 | + </fail> |
1449 | + </target> |
1450 | + --> |
1451 | + |
1452 | + <target name="compileMain" depends="stagedcompile" |
1453 | + description="Compile the Java and Groovy code in the main source."> |
1454 | + </target> |
1455 | + |
1456 | + <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber"> |
1457 | + <mkdir dir="${mainClassesDirectory}"/> |
1458 | + <mkdir dir="${toolsClassesDirectory}"/> |
1459 | + <mkdir dir="${mainClassesDirectory}/META-INF"/> |
1460 | + |
1461 | + <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}" |
1462 | + deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath"> |
1463 | + <exclude name="groovy/ui/**/*.java"/> |
1464 | + </javac> |
1465 | + <java classname="org.codehaus.groovy.tools.DgmConverter" |
1466 | + fork="yes" |
1467 | + failonerror="true"> |
1468 | + <classpath refid="compilePath"/> |
1469 | + <classpath path="${mainClassesDirectory}"/> |
1470 | + </java> |
1471 | + <antcall inheritrefs="true" target="-stagedcompile-groovy"/> |
1472 | + <antcall target="-includeResources"/> |
1473 | + </target> |
1474 | + |
1475 | + <target name="-stagedcompile-groovy" depends="-initGroovyc"> |
1476 | + <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" |
1477 | + memorymaximumsize="${groovycMain_mx}"> |
1478 | + <classpath> |
1479 | + <pathelement path="${mainClassesDirectory}"/> |
1480 | + <path refid="compilePath"/> |
1481 | + </classpath> |
1482 | + <javac deprecation="on" debug="yes" source="1.5" target="1.5"/> |
1483 | + </groovyc> |
1484 | + </target> |
1485 | + |
1486 | + <property name="vm5GroovySourceFiles" value="**/*.groovy"/> |
1487 | + <property name="vm5JavaSourceFiles" value="**/*.java"/> |
1488 | + <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy,org/codehaus/groovy/**/vm6/*Test.groovy"/> |
1489 | + |
1490 | + <target name="-initGroovyc"> |
1491 | + <path id="groovyMainClasses"> |
1492 | + <pathelement path="${mainClassesDirectory}"/> |
1493 | + <path refid="compilePath"/> |
1494 | + </path> |
1495 | + <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/> |
1496 | + </target> |
1497 | + |
1498 | + <target name="compileTest" depends="compileMain,compileTestOnly" |
1499 | + description="Compile the Java and Groovy code in the test source."/> |
1500 | + |
1501 | + <target name="-cleanTest"> |
1502 | + <delete dir="${testClassesDirectory}"/> |
1503 | + </target> |
1504 | + |
1505 | + <target name="compileTestOnly" unless="_skipTests_"> |
1506 | + <mkdir dir="${testClassesDirectory}"/> |
1507 | + <antcall inheritrefs="true" target="-compileTest"/> |
1508 | + </target> |
1509 | + |
1510 | + <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6"> |
1511 | + <groovyc srcdir="${testSourceDirectory}" |
1512 | + destdir="${testClassesDirectory}" |
1513 | + includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}" |
1514 | + excludes="${vm6GroovySourceFiles}" |
1515 | + fork="true" |
1516 | + memorymaximumsize="${groovycTest_mx}"> |
1517 | + <classpath> |
1518 | + <pathelement path="${testClassesDirectory}"/> |
1519 | + <path refid="groovyMainClasses"/> |
1520 | + <path refid="testLibPath"/> |
1521 | + </classpath> |
1522 | + <javac source="1.5" target="1.5" nowarn="on"/> |
1523 | + </groovyc> |
1524 | + </target> |
1525 | + |
1526 | + <target name="-compileTest_vm6" if="groovy.build.vm6"> |
1527 | + <groovyc srcdir="${testSourceDirectory}" |
1528 | + destdir="${testClassesDirectory}" |
1529 | + includes="${vm6GroovySourceFiles}" |
1530 | + fork="true" |
1531 | + memorymaximumsize="${groovycTest_mx}"> |
1532 | + <classpath> |
1533 | + <pathelement path="${testClassesDirectory}"/> |
1534 | + <path refid="groovyMainClasses"/> |
1535 | + <path refid="testLibPath"/> |
1536 | + </classpath> |
1537 | + <!-- currently not needed, add in if/when required --> |
1538 | + <!--<javac source="1.5" target="1.5" nowarn="on"/>--> |
1539 | + </groovyc> |
1540 | + </target> |
1541 | + |
1542 | + <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" |
1543 | + unless="_skipExamples_" |
1544 | + description="Compile the Java and Groovy code in the examples source directory."> |
1545 | + <mkdir dir="${examplesClassesDirectory}"/> |
1546 | + <echo message="Compiling example code."/> |
1547 | + |
1548 | + <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy" |
1549 | + destdir="${examplesClassesDirectory}" |
1550 | + fork="true" |
1551 | + memorymaximumsize="${groovycExamples_mx}"> |
1552 | + <classpath> |
1553 | + <pathelement path="${mainClassesDirectory}"/> |
1554 | + <path refid="compilePath"/> |
1555 | + <path refid="examplesPath"/> |
1556 | + </classpath> |
1557 | + </groovyc> |
1558 | + <javac srcdir="${examplesSourceDirectory}" |
1559 | + destdir="${examplesClassesDirectory}" |
1560 | + source="1.5" |
1561 | + target="1.5" |
1562 | + fork="true"> |
1563 | + <classpath> |
1564 | + <pathelement path="${mainClassesDirectory}"/> |
1565 | + <pathelement path="${examplesClassesDirectory}"/> |
1566 | + <path refid="compilePath"/> |
1567 | + <path refid="examplesPath"/> |
1568 | + </classpath> |
1569 | + </javac> |
1570 | + <groovyc srcdir="${examplesSourceDirectory}" |
1571 | + destdir="${examplesClassesDirectory}" |
1572 | + fork="true" |
1573 | + memorymaximumsize="${groovycExamples_mx}" |
1574 | + excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java"> |
1575 | + <classpath> |
1576 | + <pathelement path="${mainClassesDirectory}"/> |
1577 | + <pathelement path="${examplesClassesDirectory}"/> |
1578 | + <path refid="compilePath"/> |
1579 | + <path refid="examplesPath"/> |
1580 | + </classpath> |
1581 | + <javac source="1.5" target="1.5"/> |
1582 | + </groovyc> |
1583 | + |
1584 | + </target> |
1585 | + |
1586 | + <target name="-initializeReports"> |
1587 | + <mkdir dir="${reportsDirectory}"/> |
1588 | + </target> |
1589 | + |
1590 | + <condition property="_shouldBeHeadless_"> |
1591 | + <or> |
1592 | + <istrue value="${java.awt.headless}"/> |
1593 | + <!--<os name="Mac OS X"/>--> |
1594 | + </or> |
1595 | + </condition> |
1596 | + |
1597 | + <target name="-testInit" depends="-initHeadless"> |
1598 | + <property name="headlessArg" value=""/> |
1599 | + <property name="junitJvmArgs" |
1600 | + value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props} -DjavadocAssertion.src.dir=./src/main"/> |
1601 | + </target> |
1602 | + |
1603 | + <target name="-initHeadless" if="_shouldBeHeadless_"> |
1604 | + <property name="headlessArg" value="-Djava.awt.headless=true"/> |
1605 | + <echo message="Setting headless mode ..."/> |
1606 | + </target> |
1607 | + |
1608 | + <target name="test" |
1609 | + depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed" |
1610 | + description="Compile and test all the classes (or just one class if testCase property is defined)."/> |
1611 | + |
1612 | + <target name="clean-test" depends="clean,test" |
1613 | + description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/> |
1614 | + |
1615 | + <condition property="_testOne_"> |
1616 | + <and> |
1617 | + <not> |
1618 | + <istrue value="${_skipTests_}"/> |
1619 | + </not> |
1620 | + <isset property="testCase"/> |
1621 | + </and> |
1622 | + </condition> |
1623 | + |
1624 | + <target name="-testOne" if="_testOne_" depends="-initGroovyc"> |
1625 | + <mkdir dir="${junitRawDirectory}"/> |
1626 | + <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" |
1627 | + maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
1628 | + <sysproperty key="apple.awt.UIElement" value="true"/> |
1629 | + <!-- keeps the dock from showing the AWT startup --> |
1630 | + <jvmarg line="${junitJvmArgs}"/> |
1631 | + <test name="${testCase}" todir="${junitRawDirectory}"/> |
1632 | + <formatter type="brief" usefile="false"/> |
1633 | + <classpath> |
1634 | + <pathelement path="${instrumentedClassesDirectory}"/> |
1635 | + <pathelement path="src/test"/> |
1636 | + <path refid="groovyMainClasses"/> |
1637 | + <path refid="testLibPath"/> |
1638 | + <pathelement path="${testClassesDirectory}"/> |
1639 | + <path refid="coberturaPath"/> |
1640 | + </classpath> |
1641 | + <assertions> |
1642 | + <enable/> |
1643 | + </assertions> |
1644 | + </junit> |
1645 | + </target> |
1646 | + |
1647 | + <condition property="_testAll_"> |
1648 | + <and> |
1649 | + <not> |
1650 | + <istrue value="${_skipTests_}"/> |
1651 | + </not> |
1652 | + <not> |
1653 | + <isset property="_testOne_"/> |
1654 | + </not> |
1655 | + </and> |
1656 | + </condition> |
1657 | + |
1658 | + <target name="-collectOptionalTests"> |
1659 | + <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-"> |
1660 | + <istrue value="${junit.network}"/> |
1661 | + </condition> |
1662 | + <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/> |
1663 | + </target> |
1664 | + |
1665 | + <target name="-collect15tests" unless="groovy.build.vm6"> |
1666 | + <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class"/> |
1667 | + </target> |
1668 | + |
1669 | + <target name="-collect16tests" if="groovy.build.vm6"> |
1670 | + <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class"/> |
1671 | + </target> |
1672 | + |
1673 | + <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc"> |
1674 | + <mkdir dir="${junitRawDirectory}"/> |
1675 | + <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" |
1676 | + maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
1677 | + <jvmarg line="${junitJvmArgs}"/> |
1678 | + <sysproperty key="apple.awt.UIElement" value="true"/> |
1679 | + <!-- keeps the dock from showing the AWT startup --> |
1680 | + <formatter type="xml"/> |
1681 | + <formatter type="plain" unless="noTextReports"/> |
1682 | + <batchtest todir="${junitRawDirectory}"> |
1683 | + <fileset refid="ubertests.fileset"/> |
1684 | + <fileset refid="optionalTests.fileset"/> |
1685 | + </batchtest> |
1686 | + <classpath> |
1687 | + <pathelement path="${instrumentedClassesDirectory}"/> |
1688 | + <pathelement path="src/test"/> |
1689 | + <path refid="groovyMainClasses"/> |
1690 | + <path refid="testLibPath"/> |
1691 | + <pathelement path="${testClassesDirectory}"/> |
1692 | + <path refid="coberturaPath"/> |
1693 | + </classpath> |
1694 | + <assertions> |
1695 | + <enable/> |
1696 | + </assertions> |
1697 | + </junit> |
1698 | + <mkdir dir="${junitReportsDirectory}"/> |
1699 | + <junitreport tofile="${junitRawDirectory}/Results.xml"> |
1700 | + <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/> |
1701 | + <report format="frames" todir="${junitReportsDirectory}"/> |
1702 | + </junitreport> |
1703 | + </target> |
1704 | + |
1705 | + <target name="-reportTestFailed" depends="-coverageReport" if="testFailed"> |
1706 | + <fail message="Test failed, not processing further targets."/> |
1707 | + </target> |
1708 | + |
1709 | + <target name="-coverageInstrument" if="_forceCoverage_"> |
1710 | + <mkdir dir="${instrumentedClassesDirectory}"/> |
1711 | + <!--coberturaInstrument classesDirectory="${mainClassesDirectory}"/--> |
1712 | + </target> |
1713 | + |
1714 | + <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_"> |
1715 | + <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/--> |
1716 | + </target> |
1717 | + |
1718 | + <target name="-actuallyCreateJars" |
1719 | + depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar" |
1720 | + unless="testFailed"/> |
1721 | + |
1722 | + <target name="-makeManifest"> |
1723 | + <mkdir dir="${mainClassesDirectory}/META-INF"/> |
1724 | + <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/> |
1725 | + <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
1726 | + </target> |
1727 | + |
1728 | + <macrodef name="makeManifest"> |
1729 | + <attribute name="file"/> |
1730 | + <attribute name="bundleEnvironment" default="J2SE-1.5"/> |
1731 | + <sequential> |
1732 | + <manifest file="@{file}"> |
1733 | + <attribute name="Built-By" value="${user.name}"/> |
1734 | + <attribute name="Extension-Name" value="groovy"/> |
1735 | + <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
1736 | + <attribute name="Specification-Version" value="${groovyVersion}"/> |
1737 | + <attribute name="Specification-Vendor" value="The Codehaus"/> |
1738 | + <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
1739 | + <attribute name="Implementation-Version" value="${groovyVersion}"/> |
1740 | + <attribute name="Implementation-Vendor" value="The Codehaus"/> |
1741 | + <attribute name="Bundle-ManifestVersion" value="2"/> |
1742 | + <attribute name="Bundle-Name" value="Groovy Runtime"/> |
1743 | + <attribute name="Bundle-Description" value="Groovy Runtime"/> |
1744 | + <attribute name="Bundle-Version" value="${groovyBundleVersion}"/> |
1745 | + <attribute name="Bundle-Vendor" value="The Codehaus"/> |
1746 | + <attribute name="Bundle-ClassPath" value="."/> |
1747 | + <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}"/> |
1748 | + <attribute name="Eclipse-BuddyPolicy" value="dependent"/> |
1749 | + <attribute name="Eclipse-LazyStart" value="true"/> |
1750 | + <attribute name="DynamicImport-Package" value="*"/> |
1751 | + </manifest> |
1752 | + </sequential> |
1753 | + </macrodef> |
1754 | + |
1755 | + <target name="-includeResources" depends="-includeGroovyDocTemplates"> |
1756 | + <copy todir="${mainClassesDirectory}"> |
1757 | + <fileset dir="${mainSourceDirectory}"> |
1758 | + <include name="META-INF/services/*"/> |
1759 | + <include name="groovy/grape/*.xml"/> |
1760 | + <include name="groovy/ui/*.properties"/> |
1761 | + <include name="groovy/ui/**/*.png"/> |
1762 | + <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/> |
1763 | + <include name="org/codehaus/groovy/tools/shell/**/*.properties"/> |
1764 | + <include name="org/codehaus/groovy/tools/groovydoc/**/*.properties"/> |
1765 | + <include name="org/codehaus/groovy/tools/shell/**/*.xml"/> |
1766 | + <include name="org/codehaus/groovy/antlib.xml"/> |
1767 | + </fileset> |
1768 | + </copy> |
1769 | + <antcall target="-includeReleaseInfo"/> |
1770 | + </target> |
1771 | + |
1772 | + <target name="-includeReleaseInfo"> |
1773 | + <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" |
1774 | + todir="${mainClassesDirectory}/META-INF" overwrite="true"> |
1775 | + </copy> |
1776 | + <tstamp> |
1777 | + <format property="release.date" pattern="dd-MMM-yyyy"/> |
1778 | + <format property="release.time" pattern="hh:mm aa"/> |
1779 | + </tstamp> |
1780 | + <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties"> |
1781 | + <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/> |
1782 | + <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/> |
1783 | + <replacefilter token="##BuildDate##" value="${release.date}"/> |
1784 | + <replacefilter token="##BuildTime##" value="${release.time}"/> |
1785 | + </replace> |
1786 | + </target> |
1787 | + |
1788 | + <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates"> |
1789 | + <copy todir="${examplesClassesDirectory}"> |
1790 | + <fileset dir="${examplesSourceDirectory}"> |
1791 | + <include name="/swing/binding/caricature/resources/*.gif"/> |
1792 | + </fileset> |
1793 | + </copy> |
1794 | + </target> |
1795 | + |
1796 | + <target name="-includeGroovyDocTemplates"> |
1797 | + <copy todir="${mainClassesDirectory}"> |
1798 | + <fileset dir="${mainSourceDirectory}"> |
1799 | + <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/*/*.*"/> |
1800 | + </fileset> |
1801 | + <fileset dir="${toolsSourceDirectory}"> |
1802 | + <include name="org/codehaus/groovy/tools/groovy.ico"/> |
1803 | + </fileset> |
1804 | + </copy> |
1805 | + </target> |
1806 | + |
1807 | + <target name="-initializeJars" depends="test" unless="_skipDocs_"> |
1808 | + <delete dir="${targetDistDirectory}" quiet="true"/> |
1809 | + <mkdir dir="${targetDistDirectory}"/> |
1810 | + </target> |
1811 | + |
1812 | + <target name="-createBaseJar" unless="testFailed"> |
1813 | + <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}" |
1814 | + excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
1815 | + <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/> |
1816 | + </target> |
1817 | + |
1818 | + <target name="-jarjarInit" unless="_skipEmbeddable_"> |
1819 | + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/> |
1820 | + </target> |
1821 | + |
1822 | + <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/> |
1823 | + |
1824 | + <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_"> |
1825 | + <delete dir="${stagingDirectory}" quiet="true"/> |
1826 | + <mkdir dir="${stagingDirectory}"/> |
1827 | + <unzip dest="${stagingDirectory}"> |
1828 | + <fileset dir="/usr/share/java"> |
1829 | + <include name="antlr.jar"/> |
1830 | + <include name="asm3.jar"/> |
1831 | + <include name="asm3-commons.jar"/> |
1832 | + <include name="asm3-tree.jar"/> |
1833 | + <include name="asm3-xml.jar"/> |
1834 | + </fileset> |
1835 | + </unzip> |
1836 | + <unzip dest="${stagingDirectory}"> |
1837 | + <fileset dir="${targetDistDirectory}"> |
1838 | + <include name="groovy.jar"/> |
1839 | + </fileset> |
1840 | + </unzip> |
1841 | + <copy toDir="${stagingDirectory}/META-INF"> |
1842 | + <fileset dir="${basedir}/config/build"> |
1843 | + <include name="*LICENSE.txt"/> |
1844 | + </fileset> |
1845 | + </copy> |
1846 | + <!-- add commons-cli --> |
1847 | + <unzip dest="${stagingDirectory}"> |
1848 | + <patternset> |
1849 | + <!-- no need for the manifest file, we have our own --> |
1850 | + <exclude name="META-INF/MANIFEST.MF"/> |
1851 | + </patternset> |
1852 | + <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/> |
1853 | + <fileset dir="/usr/share/java"> |
1854 | + <include name="commons-cli.jar"/> |
1855 | + </fileset> |
1856 | + </unzip> |
1857 | + <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/> |
1858 | + <!-- TODO try to make use of jarjar keep ability --> |
1859 | + <jarjar jarfile="${targetDistDirectory}/groovy-all.jar" |
1860 | + manifest="${stagingDirectory}/META-INF/MANIFEST.MF"> |
1861 | + <fileset dir="${stagingDirectory}" |
1862 | + excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
1863 | + <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/> |
1864 | + <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/> |
1865 | + <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/> |
1866 | + </jarjar> |
1867 | + <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true" |
1868 | + basedir="${stagingDirectory}" |
1869 | + includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
1870 | + |
1871 | + <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" |
1872 | + tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/> |
1873 | + <delete dir="${stagingDirectory}" quiet="true"/> |
1874 | + </target> |
1875 | + |
1876 | + <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars" |
1877 | + description="Build Groovy and create the jarfiles."/> |
1878 | + |
1879 | + <target name="updateJarsForOsgi" unless="_skipOsgi_"> |
1880 | + <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/> |
1881 | + <copy todir="${targetDistDirectory}"> |
1882 | + <fileset dir="config/bnd" includes="groovy*.bnd"/> |
1883 | + <filterset> |
1884 | + <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/> |
1885 | + </filterset> |
1886 | + </copy> |
1887 | + <property name="jarsToWrap" value="groovy.jar,groovy-all.jar"/> |
1888 | + <property name="runtimeJars" refid="runtimePath"/> |
1889 | + <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true" |
1890 | + classpath="${runtimeJars}"> |
1891 | + <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
1892 | + </bndwrap> |
1893 | + <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
1894 | + <move todir="${targetDistDirectory}"> |
1895 | + <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/> |
1896 | + <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/> |
1897 | + </move> |
1898 | + <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/> |
1899 | + </target> |
1900 | + |
1901 | + <target name="skipOsgi" if="_skipOsgi_"> |
1902 | + <move todir="${targetDistDirectory}"> |
1903 | + <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/> |
1904 | + <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/> |
1905 | + </move> |
1906 | + </target> |
1907 | + |
1908 | + <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed" |
1909 | + description="Create an installation hierarchy in target/install."> |
1910 | + |
1911 | + <!-- |
1912 | + FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools) |
1913 | + ability to run faster incremental builds. |
1914 | + --> |
1915 | + <delete dir="${installDirectory}" quiet="true"/> |
1916 | + <mkdir dir="${installDirectory}"/> |
1917 | + |
1918 | + <!-- Install license files --> |
1919 | + <copy todir="${installDirectory}"> |
1920 | + <fileset dir="${basedir}"> |
1921 | + <include name="LICENSE.txt"/> |
1922 | + <include name="NOTICE.txt"/> |
1923 | + </fileset> |
1924 | + </copy> |
1925 | + <unzip dest="${installDirectory}"> |
1926 | + <patternset> |
1927 | + <include name="META-INF/*-LICENSE.txt"/> |
1928 | + </patternset> |
1929 | + <mapper type="flatten"/> |
1930 | + <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/> |
1931 | + </unzip> |
1932 | + <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/> |
1933 | + |
1934 | + <!-- Install generated artifacts and runtime dependencies --> |
1935 | + <mkdir dir="${installDirectory}/lib"/> |
1936 | + <copy todir="${installDirectory}/lib"> |
1937 | + <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/> |
1938 | + </copy> |
1939 | + |
1940 | + <!-- Install the embeddable bits --> |
1941 | + <mkdir dir="${installDirectory}/embeddable"/> |
1942 | + <copy todir="${installDirectory}/embeddable"> |
1943 | + <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/> |
1944 | + </copy> |
1945 | + |
1946 | + <!-- Install configuration files --> |
1947 | + <mkdir dir="${installDirectory}/conf"/> |
1948 | + <copy toDir="${installDirectory}/conf"> |
1949 | + <fileset dir="${sourceDirectory}/conf" includes="*"/> |
1950 | + </copy> |
1951 | + |
1952 | + <!-- Install scripts --> |
1953 | + <mkdir dir="${installDirectory}/bin"/> |
1954 | + <copy toDir="${installDirectory}/bin"> |
1955 | + <fileset dir="${sourceDirectory}/bin" includes="*"/> |
1956 | + <filterset> |
1957 | + <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/> |
1958 | + </filterset> |
1959 | + </copy> |
1960 | + <!-- icon --> |
1961 | + <copy todir="${installDirectory}/bin" flatten="true"> |
1962 | + <fileset dir="${toolsSourceDirectory}"> |
1963 | + <include name="org/codehaus/groovy/tools/groovy.ico"/> |
1964 | + </fileset> |
1965 | + </copy> |
1966 | + |
1967 | + <!-- Tweak scripts for platform compatibility --> |
1968 | + <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat, *.icns"/> |
1969 | + <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/> |
1970 | + <chmod perm="ugo+x"> |
1971 | + <fileset dir="${installDirectory}/bin" includes="*,*.*"/> |
1972 | + </chmod> |
1973 | + </target> |
1974 | + |
1975 | + <target name="checkstyle" depends="-init,-initializeReports" |
1976 | + description="Create the code style reports."> |
1977 | + <checkAndReport |
1978 | + reportDirectory="${reportsDirectory}/checkstyle" |
1979 | + sourceDirectory="${mainSourceDirectory}" |
1980 | + excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java"> |
1981 | + <path> |
1982 | + <pathelement path="${mainClassesDirectory}"/> |
1983 | + <path refid="testLibPath"/> |
1984 | + </path> |
1985 | + </checkAndReport> |
1986 | + </target> |
1987 | + |
1988 | + <target name="-compileTools" depends="-initGroovyc,compileMain"> |
1989 | + <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true"> |
1990 | + <classpath> |
1991 | + <path refid="toolsPath"/> |
1992 | + <pathelement path="${mainClassesDirectory}"/> |
1993 | + <path refid="compilePath"/> |
1994 | + </classpath> |
1995 | + </groovyc> |
1996 | + <copy todir="${toolsClassesDirectory}"> |
1997 | + <fileset dir="${toolsSourceDirectory}"> |
1998 | + <include name="**/*.html"/> |
1999 | + </fileset> |
2000 | + </copy> |
2001 | + </target> |
2002 | + |
2003 | + <target name="cruiseReportExtras"> |
2004 | + <mkdir dir="${cruiseReportRootDirectory}"/> |
2005 | + <copy todir="${cruiseReportRootDirectory}"> |
2006 | + <fileset dir="cruise/html"/> |
2007 | + </copy> |
2008 | + </target> |
2009 | + |
2010 | + <target name="cruiseInit"> |
2011 | + <property name="noTextReports" value="true"/> |
2012 | + <property name="forceCoverage" value="true"/> |
2013 | + <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/> |
2014 | + <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/> |
2015 | + </target> |
2016 | + |
2017 | + <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/> |
2018 | + |
2019 | + <target name="-docInit"> |
2020 | + <mkdir dir="${docsDirectory}"/> |
2021 | + <property name="docFooter" value="Copyright &copy; 2003-2010 The Codehaus. All rights reserved."/> |
2022 | + <property name="title" value="Groovy ${groovyVersion}"/> |
2023 | + </target> |
2024 | + |
2025 | + <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/> |
2026 | + |
2027 | + <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars" |
2028 | + unless="_skipDocs_" description="Create the javadoc documentation."> |
2029 | + <javadoc destdir="${docsDirectory}/api" author="true" version="true" |
2030 | + windowtitle="${title}" doctitle="${title}" |
2031 | + encoding="ISO-8859-1" useexternalfile="true" source="1.5" |
2032 | + footer="${docFooter}" |
2033 | + overview="src/main/overviewj.html" |
2034 | + maxmemory="${javaDoc_mx}" |
2035 | + > |
2036 | + <classpath> |
2037 | + <path path="${mainClassesDirectory}"/> |
2038 | + <path refid="compilePath"/> |
2039 | + </classpath> |
2040 | + <fileset dir="${mainSourceDirectory}" includes="**/*.java"/> |
2041 | + <link href="http://java.sun.com/javase/6/docs/api"/> |
2042 | + <link href="http://www.dpml.net/api/ant/1.7.0"/> |
2043 | + <link href="http://junit.sourceforge.net/junit3.8.1/javadoc"/> |
2044 | + <link href="http://java.sun.com/j2ee/1.4/docs/api"/> |
2045 | + <link href="http://www.antlr2.org/javadoc"/> |
2046 | + <link href="http://commons.apache.org/cli/api-release"/> |
2047 | + </javadoc> |
2048 | + <mkdir dir="${targetDistDirectory}"/> |
2049 | + <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
2050 | + <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar"> |
2051 | + <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
2052 | + </copy> |
2053 | + </target> |
2054 | + |
2055 | + <target name="groovydoc"> |
2056 | + <path id="groovydocpath"> |
2057 | + <path path="${mainClassesDirectory}"/> |
2058 | + <path refid="compilePath"/> |
2059 | + </path> |
2060 | + <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/> |
2061 | + </target> |
2062 | + |
2063 | + <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK"> |
2064 | + <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc"> |
2065 | + <classpath> |
2066 | + <path path="${mainClassesDirectory}"/> |
2067 | + <path refid="compilePath"/> |
2068 | + </classpath> |
2069 | + </taskdef> |
2070 | + <groovydoc |
2071 | + destdir="${docsDirectory}/gapi" |
2072 | + sourcepath="${mainSourceDirectory}" |
2073 | + packagenames="**.*" |
2074 | + use="true" |
2075 | + windowtitle="${title}" |
2076 | + doctitle="${title}" |
2077 | + header="${title}" |
2078 | + footer="${docFooter}" |
2079 | + overview="src/main/overview.html"> |
2080 | + <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/> |
2081 | + <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/javase/6/docs/api"/> |
2082 | + <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/> |
2083 | + <link packages="org.junit.,junit." href="http://junit.sourceforge.net/junit3.8.1/javadoc"/> |
2084 | + <link packages="org.apache.commons.cli." href="http://commons.apache.org/cli/api-release"/> |
2085 | + <link packages="antlr." href="http://www.antlr2.org/javadoc"/> |
2086 | + </groovydoc> |
2087 | + </target> |
2088 | + |
2089 | + <target name="docGDK" depends="-compileTools" description="Create the GDK documentation"> |
2090 | + <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true"> |
2091 | + <classpath> |
2092 | + <pathelement path="${toolsClassesDirectory}"/> |
2093 | + <path refid="toolsPath"/> |
2094 | + <pathelement path="${mainClassesDirectory}"/> |
2095 | + </classpath> |
2096 | + <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/> |
2097 | + <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/> |
2098 | + <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/> |
2099 | + <arg value="org.codehaus.groovy.runtime.XmlGroovyMethods"/> |
2100 | + <arg value="org.codehaus.groovy.runtime.EncodingGroovyMethods"/> |
2101 | + <arg value="org.codehaus.groovy.runtime.DateGroovyMethods"/> |
2102 | + <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/> |
2103 | + <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/> |
2104 | + <arg value="org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods"/> |
2105 | + </java> |
2106 | + <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/> |
2107 | + <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/> |
2108 | + </target> |
2109 | + |
2110 | + <target name="clean" description="Clean up build artifacts."> |
2111 | + <delete dir="${targetDirectory}" quiet="true"/> |
2112 | + <delete file="cobertura.ser" quiet="true" failonerror="false"/> |
2113 | + <delete quiet="true"> |
2114 | + <fileset dir="." includes="**/*~"/> |
2115 | + <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/> |
2116 | + <fileset dir="${javaParserDirectory}" |
2117 | + includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/> |
2118 | + </delete> |
2119 | + </target> |
2120 | + |
2121 | + <target name="deploy" depends="install,doc" |
2122 | + description="Deploy jars to maven repository."/> |
2123 | + |
2124 | + <target name="-deployDefault" unless="_forceServerSettings_"> |
2125 | + <mavenDeploy version="${groovyVersion}" prefix="groovy"/> |
2126 | + <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/> |
2127 | + </target> |
2128 | + |
2129 | + <target name="-deployFromServer" if="_forceServerSettings_"> |
2130 | + <copy tofile="target/settings.xml"> |
2131 | + <fileset file="config/maven/settings.xml"/> |
2132 | + <filterset> |
2133 | + <filter token="groovy.deploy.username" value="${groovy.deploy.username}"/> |
2134 | + <filter token="groovy.deploy.password" value="${groovy.deploy.password}"/> |
2135 | + </filterset> |
2136 | + </copy> |
2137 | + <mavenDeploySettings version="${groovyVersion}" prefix="groovy" settings="target/settings.xml"/> |
2138 | + <mavenDeploySettings version="${groovyVersion}" prefix="groovy-all" settings="target/settings.xml"/> |
2139 | + <delete file="target/settings.xml"/> |
2140 | + </target> |
2141 | + |
2142 | + <target name="installRepo" depends="install,doc" |
2143 | + description="Deploy artifacts to local maven repository."> |
2144 | + <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/> |
2145 | + <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/> |
2146 | + </target> |
2147 | + |
2148 | + <target name="quality" depends="install,checkstyle" description="install plus checkstyle"/> |
2149 | + |
2150 | + <target name="release" depends="deploy,compileExamples" description="deploy plus compileExamples"/> |
2151 | + |
2152 | + <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/> |
2153 | + |
2154 | + <target name="dist" depends="install,doc" description="Create everything needed for a distribution."> |
2155 | + <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip" |
2156 | + comment="The Groovy ${groovyVersion} binary distribution."> |
2157 | + |
2158 | + <!-- Make unix scripts executable --> |
2159 | + <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775"> |
2160 | + <include name="bin/*"/> |
2161 | + <exclude name="bin/*.*"/> |
2162 | + <exclude name="bin/startGroovy*"/> |
2163 | + </zipfileset> |
2164 | + |
2165 | + <!-- Include the other scripts as is --> |
2166 | + <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
2167 | + <include name="bin/*.*"/> |
2168 | + <include name="bin/startGroovy*"/> |
2169 | + </zipfileset> |
2170 | + |
2171 | + <!-- Include everything else as is too --> |
2172 | + <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
2173 | + <exclude name="bin/**"/> |
2174 | + <include name="**"/> |
2175 | + </zipfileset> |
2176 | + </zip> |
2177 | + |
2178 | + <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip" |
2179 | + comment="The Groovy ${groovyVersion} documentation distribution."> |
2180 | + <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/> |
2181 | + <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/> |
2182 | + </zip> |
2183 | + |
2184 | + <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip" |
2185 | + comment="The Groovy ${groovyVersion} source distribution."> |
2186 | + <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}"> |
2187 | + <!-- Exclude generated bits as well as any other bits that shouldn't make it in --> |
2188 | + <exclude name="${targetDirectory}/**"/> |
2189 | + <exclude name="classes/**"/> |
2190 | + <exclude name="cruise/**"/> |
2191 | + <exclude name=".clover/*"/> |
2192 | + <exclude name="local.build.properties"/> |
2193 | + <exclude name="cobertura.ser"/> |
2194 | + <exclude name="junitvmwatcher*.properties"/> |
2195 | + </zipfileset> |
2196 | + </zip> |
2197 | + </target> |
2198 | + |
2199 | +</project> |
2200 | |
2201 | === removed directory '.pc/ant-build.diff' |
2202 | === removed file '.pc/ant-build.diff/build.xml' |
2203 | --- .pc/ant-build.diff/build.xml 2010-02-26 16:39:51 +0000 |
2204 | +++ .pc/ant-build.diff/build.xml 1970-01-01 00:00:00 +0000 |
2205 | @@ -1,865 +0,0 @@ |
2206 | -<?xml version="1.0" encoding="UTF-8"?> |
2207 | - |
2208 | -<!-- |
2209 | -Ant build script for Groovy. |
2210 | - |
2211 | -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in |
2212 | -compliance with the License. You may obtain a copy of the License at |
2213 | - |
2214 | -http://www.apache.org/licenses/LICENSE-2.0 |
2215 | - |
2216 | -Unless required by applicable law or agreed to in writing, software distributed under the License is |
2217 | -distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
2218 | -implied. See the License for the specific language governing permissions and limitations under the License. |
2219 | - |
2220 | -This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on |
2221 | -behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information. |
2222 | - |
2223 | -Author : Russel Winder |
2224 | -Author : Paul King |
2225 | -$Revision: 18555 $ ($LastChangedBy: paulk $) |
2226 | -$Date: 2009-12-08 14:08:59 +0100 (Di, 08. Dez 2009) $ |
2227 | ---> |
2228 | - |
2229 | -<project name="Groovy" default="createJars" basedir="."> |
2230 | - |
2231 | - <property file="local.build.properties"/> |
2232 | - <property file="build.properties"/> |
2233 | - <property name="ant.requiredVersion" value="1.6.5"/> |
2234 | - |
2235 | - <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. --> |
2236 | - <import file="config/ant/build-maven.xml"/> |
2237 | - <import file="config/ant/build-checkstyle.xml"/> |
2238 | - <import file="config/ant/build-cobertura.xml"/> |
2239 | - |
2240 | - <condition property="_skipTests_"> |
2241 | - <or> |
2242 | - <equals arg1="${test}" arg2="false"/> |
2243 | - <istrue value="${skipTests}"/> |
2244 | - </or> |
2245 | - </condition> |
2246 | - |
2247 | - <condition property="_skipExamples_"> |
2248 | - <istrue value="${skipExamples}"/> |
2249 | - </condition> |
2250 | - |
2251 | - <condition property="_skipOsgi_"> |
2252 | - <istrue value="${skipOsgi}"/> |
2253 | - </condition> |
2254 | - |
2255 | - <condition property="_skipFetch_"> |
2256 | - <istrue value="${skipFetch}"/> |
2257 | - </condition> |
2258 | - |
2259 | - <condition property="_skipEmbeddable_"> |
2260 | - <istrue value="${skipEmbeddable}"/> |
2261 | - </condition> |
2262 | - |
2263 | - <condition property="groovy.build.vm4"> |
2264 | - <contains string="${ant.java.version}" substring="1.4"/> |
2265 | - </condition> |
2266 | - |
2267 | - <condition property="groovy.build.vm6"> |
2268 | - <contains string="${ant.java.version}" substring="1.6"/> |
2269 | - </condition> |
2270 | - |
2271 | - <presetdef name="javac"> |
2272 | - <javac memoryMaximumSize="500m"/> |
2273 | - </presetdef> |
2274 | - |
2275 | - <target name="-initCoverage"> |
2276 | - <condition property="_forceCoverage_"> |
2277 | - <and> |
2278 | - <not> |
2279 | - <istrue value="${skipTests}"/> |
2280 | - </not> |
2281 | - <istrue value="${forceCoverage}"/> |
2282 | - </and> |
2283 | - </condition> |
2284 | - </target> |
2285 | - |
2286 | - <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date."> |
2287 | - <mkdir dir="${groovyParserDirectory}"/> |
2288 | - <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}"> |
2289 | - <classpath refid="compilePath"/> |
2290 | - </antlr> |
2291 | - <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}"> |
2292 | - <classpath refid="compilePath"/> |
2293 | - </antlr> |
2294 | - </target> |
2295 | - |
2296 | - <target name="updatePolicy"> |
2297 | - <move file="security/groovy.policy" tofile="security/groovy.policy.template"/> |
2298 | - <copy tofile="security/groovy.policy"> |
2299 | - <fileset file="security/groovy.policy.template"/> |
2300 | - <filterset> |
2301 | - <filter token="relativePathToRealBasedir" value="${relativePathToRealBasedir}"/> |
2302 | - </filterset> |
2303 | - </copy> |
2304 | - </target> |
2305 | - |
2306 | - <target name="-init" depends="-fetchDependencies"/> |
2307 | - |
2308 | - <target name="-banner"> |
2309 | - <echo message="Java Runtime Environment version: ${java.version}"/> |
2310 | - <echo message="Java Runtime Environment vendor: ${java.vendor}"/> |
2311 | - <echo message="Ant version: ${ant.version}"/> |
2312 | - <echo message="Operating system name: ${os.name}"/> |
2313 | - <echo message="Operating system architecture: ${os.arch}"/> |
2314 | - <echo message="Operating system version: ${os.version}"/> |
2315 | - <echo message="Base directory: ${basedir}"/> |
2316 | - <echo message="Java Home: ${java.home}"/> |
2317 | - </target> |
2318 | - |
2319 | - <target name="-jvm14BuildWarning" if="groovy.build.vm4"> |
2320 | - <fail>Aborting! |
2321 | - |
2322 | -================================================ |
2323 | - ERROR: You must build Groovy with a 1.5+ JDK |
2324 | -================================================ |
2325 | - </fail> |
2326 | - </target> |
2327 | - |
2328 | - <target name="-checkAntVersion" depends="-excludeLegacyAntVersion" |
2329 | - description="Check that we are running on the required version of Ant."/> |
2330 | - |
2331 | - <target name="-excludeLegacyAntVersion"> |
2332 | - <!-- antversion didn't exist in early versions of ant so we have |
2333 | - a legacy check to provide a nicer error message in this case --> |
2334 | - <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+"> |
2335 | - <condition> |
2336 | - <or> |
2337 | - <contains string="${ant.version}" substring="1.1"></contains> |
2338 | - <contains string="${ant.version}" substring="1.2"></contains> |
2339 | - <contains string="${ant.version}" substring="1.3"></contains> |
2340 | - <contains string="${ant.version}" substring="1.4"></contains> |
2341 | - <contains string="${ant.version}" substring="1.5"></contains> |
2342 | - <and> |
2343 | - <contains string="${ant.version}" substring="1.6"></contains> |
2344 | - <not> |
2345 | - <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains> |
2346 | - </not> |
2347 | - </and> |
2348 | - </or> |
2349 | - </condition> |
2350 | - </fail> |
2351 | - </target> |
2352 | - |
2353 | - <!-- add back in if we make 1.7+ minimal required version for build again |
2354 | - <target name="-ensureRequiredAntVersion"> |
2355 | - <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/> |
2356 | - <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition> |
2357 | - </fail> |
2358 | - </target> |
2359 | - --> |
2360 | - |
2361 | - <target name="dgmConvert" depends="stagedcompile"> |
2362 | - <java classname="org.codehaus.groovy.tools.DgmConverter" |
2363 | - fork="yes" |
2364 | - failonerror="true"> |
2365 | - <classpath refid="compilePath"/> |
2366 | - <classpath path="${mainClassesDirectory}"/> |
2367 | - </java> |
2368 | - </target> |
2369 | - |
2370 | - <target name="compileMain" depends="stagedcompile,dgmConvert" |
2371 | - description="Compile the Java and Groovy code in the main source."> |
2372 | - </target> |
2373 | - |
2374 | - <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber"> |
2375 | - <mkdir dir="${mainClassesDirectory}"/> |
2376 | - <mkdir dir="${toolsClassesDirectory}"/> |
2377 | - |
2378 | - <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}" |
2379 | - deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath"> |
2380 | - <exclude name="groovy/ui/**/*.java"/> |
2381 | - </javac> |
2382 | - <antcall inheritrefs="true" target="-stagedcompile-groovy"/> |
2383 | - <antcall target="-includeResources"/> |
2384 | - </target> |
2385 | - |
2386 | - <target name="-stagedcompile-groovy" depends="-initGroovyc"> |
2387 | - <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" memorymaximumsize="${groovycMain_mx}"> |
2388 | - <classpath> |
2389 | - <pathelement path="${mainClassesDirectory}"/> |
2390 | - <path refid="compilePath"/> |
2391 | - </classpath> |
2392 | - <javac deprecation="on" debug="yes" source="1.5" target="1.5"/> |
2393 | - </groovyc> |
2394 | - </target> |
2395 | - |
2396 | - <property name="vm5GroovySourceFiles" value="**/*.groovy"/> |
2397 | - <property name="vm5JavaSourceFiles" value="**/*.java"/> |
2398 | - <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy"/> |
2399 | - |
2400 | - <target name="-initGroovyc"> |
2401 | - <path id="groovyMainClasses"> |
2402 | - <pathelement path="${mainClassesDirectory}"/> |
2403 | - <path refid="compilePath"/> |
2404 | - </path> |
2405 | - <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/> |
2406 | - </target> |
2407 | - |
2408 | - <target name="compileTest" depends="compileMain,compileTestOnly" |
2409 | - description="Compile the Java and Groovy code in the test source."/> |
2410 | - |
2411 | - <target name="-cleanTest"> |
2412 | - <delete dir="${testClassesDirectory}"/> |
2413 | - </target> |
2414 | - |
2415 | - <target name="compileTestOnly" unless="_skipTests_"> |
2416 | - <mkdir dir="${testClassesDirectory}"/> |
2417 | - <antcall inheritrefs="true" target="-compileTest"/> |
2418 | - </target> |
2419 | - |
2420 | - <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6"> |
2421 | - <groovyc srcdir="${testSourceDirectory}" |
2422 | - destdir="${testClassesDirectory}" |
2423 | - includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}" |
2424 | - excludes="${vm6GroovySourceFiles}" |
2425 | - fork="true" |
2426 | - memorymaximumsize="${groovycTest_mx}"> |
2427 | - <classpath> |
2428 | - <pathelement path="${testClassesDirectory}"/> |
2429 | - <path refid="groovyMainClasses"/> |
2430 | - <path refid="testLibPath"/> |
2431 | - </classpath> |
2432 | - <javac source="1.5" target="1.5" nowarn="on"/> |
2433 | - </groovyc> |
2434 | - </target> |
2435 | - |
2436 | - <target name="-compileTest_vm6" if="groovy.build.vm6"> |
2437 | - <groovyc srcdir="${testSourceDirectory}" |
2438 | - destdir="${testClassesDirectory}" |
2439 | - includes="${vm6GroovySourceFiles}" |
2440 | - fork="true" |
2441 | - memorymaximumsize="${groovycTest_mx}"> |
2442 | - <classpath> |
2443 | - <pathelement path="${testClassesDirectory}"/> |
2444 | - <path refid="groovyMainClasses"/> |
2445 | - <path refid="testLibPath"/> |
2446 | - </classpath> |
2447 | - <!-- currently not needed, add in if/when required --> |
2448 | - <!--<javac source="1.5" target="1.5" nowarn="on"/>--> |
2449 | - </groovyc> |
2450 | - </target> |
2451 | - |
2452 | - <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" unless="_skipExamples_" |
2453 | - description="Compile the Java and Groovy code in the examples source directory."> |
2454 | - <mkdir dir="${examplesClassesDirectory}"/> |
2455 | - <echo message="Compiling example code."/> |
2456 | - |
2457 | - <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy" |
2458 | - destdir="${examplesClassesDirectory}" |
2459 | - fork="true" |
2460 | - memorymaximumsize="${groovycExamples_mx}"> |
2461 | - <classpath> |
2462 | - <pathelement path="${mainClassesDirectory}"/> |
2463 | - <path refid="compilePath"/> |
2464 | - <path refid="examplesPath"/> |
2465 | - </classpath> |
2466 | - </groovyc> |
2467 | - <javac srcdir="${examplesSourceDirectory}" |
2468 | - destdir="${examplesClassesDirectory}" |
2469 | - source="1.5" |
2470 | - target="1.5" |
2471 | - fork="true"> |
2472 | - <classpath> |
2473 | - <pathelement path="${mainClassesDirectory}"/> |
2474 | - <pathelement path="${examplesClassesDirectory}"/> |
2475 | - <path refid="compilePath"/> |
2476 | - <path refid="examplesPath"/> |
2477 | - </classpath> |
2478 | - </javac> |
2479 | - <groovyc srcdir="${examplesSourceDirectory}" |
2480 | - destdir="${examplesClassesDirectory}" |
2481 | - fork="true" |
2482 | - memorymaximumsize="${groovycExamples_mx}" |
2483 | - excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java"> |
2484 | - <classpath> |
2485 | - <pathelement path="${mainClassesDirectory}"/> |
2486 | - <pathelement path="${examplesClassesDirectory}"/> |
2487 | - <path refid="compilePath"/> |
2488 | - <path refid="examplesPath"/> |
2489 | - </classpath> |
2490 | - <javac source="1.5" target="1.5"/> |
2491 | - </groovyc> |
2492 | - |
2493 | - </target> |
2494 | - |
2495 | - <target name="-initializeReports"> |
2496 | - <mkdir dir="${reportsDirectory}"/> |
2497 | - </target> |
2498 | - |
2499 | - <condition property="_shouldBeHeadless_"> |
2500 | - <or> |
2501 | - <istrue value="${java.awt.headless}"/> |
2502 | - <!--<os name="Mac OS X"/>--> |
2503 | - </or> |
2504 | - </condition> |
2505 | - |
2506 | - <target name="-testInit" depends="-initHeadless"> |
2507 | - <property name="headlessArg" value=""/> |
2508 | - <property name="junitJvmArgs" |
2509 | - value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props}"/> |
2510 | - </target> |
2511 | - |
2512 | - <target name="-initHeadless" if="_shouldBeHeadless_"> |
2513 | - <property name="headlessArg" value="-Djava.awt.headless=true"/> |
2514 | - <echo message="Setting headless mode ..."/> |
2515 | - </target> |
2516 | - |
2517 | - <target name="test" |
2518 | - depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed" |
2519 | - description="Compile and test all the classes (or just one class if testCase property is defined)."/> |
2520 | - |
2521 | - <target name="clean-test" depends="clean,test" |
2522 | - description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/> |
2523 | - |
2524 | - <condition property="_testOne_"> |
2525 | - <and> |
2526 | - <not> |
2527 | - <istrue value="${_skipTests_}"/> |
2528 | - </not> |
2529 | - <isset property="testCase"/> |
2530 | - </and> |
2531 | - </condition> |
2532 | - |
2533 | - <target name="-testOne" if="_testOne_" depends="-initGroovyc"> |
2534 | - <mkdir dir="${junitRawDirectory}"/> |
2535 | - <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
2536 | - <sysproperty key="apple.awt.UIElement" value="true"/> |
2537 | - <!-- keeps the dock from showing the AWT startup --> |
2538 | - <jvmarg line="${junitJvmArgs}"/> |
2539 | - <test name="${testCase}" todir="${junitRawDirectory}"/> |
2540 | - <formatter type="brief" usefile="false"/> |
2541 | - <classpath> |
2542 | - <pathelement path="${instrumentedClassesDirectory}"/> |
2543 | - <pathelement path="src/test"/> |
2544 | - <path refid="groovyMainClasses"/> |
2545 | - <path refid="testLibPath"/> |
2546 | - <pathelement path="${testClassesDirectory}"/> |
2547 | - <path refid="coberturaPath"/> |
2548 | - </classpath> |
2549 | - <assertions> |
2550 | - <enable/> |
2551 | - </assertions> |
2552 | - </junit> |
2553 | - </target> |
2554 | - |
2555 | - <condition property="_testAll_"> |
2556 | - <and> |
2557 | - <not> |
2558 | - <istrue value="${_skipTests_}"/> |
2559 | - </not> |
2560 | - <not> |
2561 | - <isset property="_testOne_"/> |
2562 | - </not> |
2563 | - </and> |
2564 | - </condition> |
2565 | - |
2566 | - <target name="-collectOptionalTests"> |
2567 | - <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-"> |
2568 | - <istrue value="${junit.network}"/> |
2569 | - </condition> |
2570 | - <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/> |
2571 | - </target> |
2572 | - |
2573 | - <target name="-collect15tests" unless="groovy.build.vm6"> |
2574 | - <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class,groovy/grape/*Test.class"/> |
2575 | - </target> |
2576 | - |
2577 | - <target name="-collect16tests" if="groovy.build.vm6"> |
2578 | - <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="groovy/grape/*Test.class"/> |
2579 | - </target> |
2580 | - |
2581 | - <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc"> |
2582 | - <mkdir dir="${junitRawDirectory}"/> |
2583 | - <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
2584 | - <jvmarg line="${junitJvmArgs}"/> |
2585 | - <sysproperty key="apple.awt.UIElement" value="true"/> |
2586 | - <!-- keeps the dock from showing the AWT startup --> |
2587 | - <formatter type="xml"/> |
2588 | - <formatter type="plain" unless="noTextReports"/> |
2589 | - <batchtest todir="${junitRawDirectory}"> |
2590 | - <fileset refid="ubertests.fileset"/> |
2591 | - <fileset refid="optionalTests.fileset"/> |
2592 | - </batchtest> |
2593 | - <classpath> |
2594 | - <pathelement path="${instrumentedClassesDirectory}"/> |
2595 | - <pathelement path="src/test"/> |
2596 | - <path refid="groovyMainClasses"/> |
2597 | - <path refid="testLibPath"/> |
2598 | - <pathelement path="${testClassesDirectory}"/> |
2599 | - <path refid="coberturaPath"/> |
2600 | - </classpath> |
2601 | - <assertions> |
2602 | - <enable/> |
2603 | - </assertions> |
2604 | - </junit> |
2605 | - <mkdir dir="${junitReportsDirectory}"/> |
2606 | - <junitreport tofile="${junitRawDirectory}/Results.xml"> |
2607 | - <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/> |
2608 | - <report format="frames" todir="${junitReportsDirectory}"/> |
2609 | - </junitreport> |
2610 | - </target> |
2611 | - |
2612 | - <target name="-reportTestFailed" depends="-coverageReport" if="testFailed"> |
2613 | - <fail message="Test failed, not processing further targets."/> |
2614 | - </target> |
2615 | - |
2616 | - <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_"> |
2617 | - <mkdir dir="${instrumentedClassesDirectory}"/> |
2618 | - <coberturaInstrument classesDirectory="${mainClassesDirectory}"/> |
2619 | - </target> |
2620 | - |
2621 | - <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_"> |
2622 | - <coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/> |
2623 | - </target> |
2624 | - |
2625 | - <target name="-actuallyCreateJars" |
2626 | - depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar" |
2627 | - unless="testFailed"/> |
2628 | - |
2629 | - <target name="-makeManifest"> |
2630 | - <mkdir dir="${mainClassesDirectory}/META-INF"/> |
2631 | - <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/> |
2632 | - <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
2633 | - </target> |
2634 | - |
2635 | - <macrodef name="makeManifest"> |
2636 | - <attribute name="file"/> |
2637 | - <attribute name="bundleEnvironment" default="J2SE-1.5"/> |
2638 | - <sequential> |
2639 | - <manifest file="@{file}"> |
2640 | - <attribute name="Built-By" value="${user.name}"/> |
2641 | - <attribute name="Extension-Name" value="groovy"/> |
2642 | - <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
2643 | - <attribute name="Specification-Version" value="${groovyVersion}"/> |
2644 | - <attribute name="Specification-Vendor" value="The Codehaus"/> |
2645 | - <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
2646 | - <attribute name="Implementation-Version" value="${groovyVersion}"/> |
2647 | - <attribute name="Implementation-Vendor" value="The Codehaus"/> |
2648 | - <attribute name="Bundle-ManifestVersion" value="2" /> |
2649 | - <attribute name="Bundle-Name" value="Groovy Runtime" /> |
2650 | - <attribute name="Bundle-Description" value="Groovy Runtime" /> |
2651 | - <attribute name="Bundle-Version" value="${groovyBundleVersion}" /> |
2652 | - <attribute name="Bundle-Vendor" value="The Codehaus" /> |
2653 | - <attribute name="Bundle-ClassPath" value="." /> |
2654 | - <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}" /> |
2655 | - <attribute name="Eclipse-BuddyPolicy" value="dependent"/> |
2656 | - <attribute name="Eclipse-LazyStart" value="true"/> |
2657 | - <attribute name="DynamicImport-Package" value="*"/> |
2658 | - </manifest> |
2659 | - </sequential> |
2660 | - </macrodef> |
2661 | - |
2662 | - <target name="-includeResources" depends="-includeGroovyDocTemplates"> |
2663 | - <copy todir="${mainClassesDirectory}"> |
2664 | - <fileset dir="${mainSourceDirectory}"> |
2665 | - <include name="META-INF/services/*"/> |
2666 | - <include name="groovy/grape/*.xml"/> |
2667 | - <include name="groovy/ui/*.properties"/> |
2668 | - <include name="groovy/ui/**/*.png"/> |
2669 | - <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/> |
2670 | - <include name="org/codehaus/groovy/tools/shell/**/*.properties"/> |
2671 | - <include name="org/codehaus/groovy/tools/shell/**/*.xml"/> |
2672 | - <include name="org/codehaus/groovy/antlib.xml"/> |
2673 | - </fileset> |
2674 | - </copy> |
2675 | - <antcall target="-includeReleaseInfo"/> |
2676 | - </target> |
2677 | - |
2678 | - <target name="-includeReleaseInfo"> |
2679 | - <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" |
2680 | - todir="${mainClassesDirectory}/META-INF" overwrite="true"> |
2681 | - </copy> |
2682 | - <tstamp> |
2683 | - <format property="release.date" pattern="dd-MMM-yyyy"/> |
2684 | - <format property="release.time" pattern="hh:mm aa"/> |
2685 | - </tstamp> |
2686 | - <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties"> |
2687 | - <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/> |
2688 | - <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/> |
2689 | - <replacefilter token="##BuildDate##" value="${release.date}"/> |
2690 | - <replacefilter token="##BuildTime##" value="${release.time}"/> |
2691 | - </replace> |
2692 | - </target> |
2693 | - |
2694 | - <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates"> |
2695 | - <copy todir="${examplesClassesDirectory}"> |
2696 | - <fileset dir="${examplesSourceDirectory}"> |
2697 | - <include name="/swing/binding/caricature/resources/*.gif"/> |
2698 | - </fileset> |
2699 | - </copy> |
2700 | - </target> |
2701 | - |
2702 | - <target name="-includeGroovyDocTemplates"> |
2703 | - <copy todir="${mainClassesDirectory}"> |
2704 | - <fileset dir="${mainSourceDirectory}"> |
2705 | - <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/**/*.*"/> |
2706 | - </fileset> |
2707 | - <fileset dir="${toolsSourceDirectory}"> |
2708 | - <include name="org/codehaus/groovy/tools/groovy.ico"/> |
2709 | - </fileset> |
2710 | - </copy> |
2711 | - </target> |
2712 | - |
2713 | - <target name="-initializeJars" depends="test"> |
2714 | - <delete dir="${targetDistDirectory}" quiet="true"/> |
2715 | - <mkdir dir="${targetDistDirectory}"/> |
2716 | - </target> |
2717 | - |
2718 | - <target name="-createBaseJar" unless="testFailed"> |
2719 | - <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}" |
2720 | - excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
2721 | - <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/> |
2722 | - </target> |
2723 | - |
2724 | - <target name="-jarjarInit" unless="_skipEmbeddable_"> |
2725 | - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/> |
2726 | - </target> |
2727 | - |
2728 | - <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/> |
2729 | - |
2730 | - <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_"> |
2731 | - <delete dir="${stagingDirectory}" quiet="true"/> |
2732 | - <mkdir dir="${stagingDirectory}"/> |
2733 | - <unzip dest="${stagingDirectory}"> |
2734 | - <fileset dir="${runtimeLibDirectory}"> |
2735 | - <include name="antlr*.jar"/> |
2736 | - <include name="asm*.jar"/> |
2737 | - <exclude name="asm-attr*.jar"/> |
2738 | - <exclude name="asm-util*.jar"/> |
2739 | - <exclude name="asm-analysis*.jar"/> |
2740 | - </fileset> |
2741 | - </unzip> |
2742 | - <unzip dest="${stagingDirectory}"> |
2743 | - <fileset dir="${targetDistDirectory}"> |
2744 | - <include name="groovy.jar"/> |
2745 | - </fileset> |
2746 | - </unzip> |
2747 | - <copy toDir="${stagingDirectory}/META-INF"> |
2748 | - <fileset dir="${basedir}/config/build"> |
2749 | - <include name="*LICENSE.txt"/> |
2750 | - </fileset> |
2751 | - </copy> |
2752 | - <!-- add commons-cli --> |
2753 | - <unzip dest="${stagingDirectory}"> |
2754 | - <patternset> |
2755 | - <!-- no need for the manifest file, we have our own --> |
2756 | - <exclude name="META-INF/MANIFEST.MF"/> |
2757 | - </patternset> |
2758 | - <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/> |
2759 | - <fileset dir="${runtimeLibDirectory}"> |
2760 | - <include name="commons-cli-*.jar"/> |
2761 | - </fileset> |
2762 | - </unzip> |
2763 | - <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" /> |
2764 | - <!-- TODO try to make use of jarjar keep ability --> |
2765 | - <jarjar jarfile="${targetDistDirectory}/groovy-all.jar" |
2766 | - manifest="${stagingDirectory}/META-INF/MANIFEST.MF"> |
2767 | - <fileset dir="${stagingDirectory}" excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
2768 | - <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/> |
2769 | - <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/> |
2770 | - <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/> |
2771 | - </jarjar> |
2772 | - <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true" |
2773 | - basedir="${stagingDirectory}" includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
2774 | - |
2775 | - <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" |
2776 | - tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/> |
2777 | - <delete dir="${stagingDirectory}" quiet="true"/> |
2778 | - </target> |
2779 | - |
2780 | - <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars" |
2781 | - description="Build Groovy and create the jarfiles."/> |
2782 | - |
2783 | - <target name="updateJarsForOsgi" unless="_skipOsgi_"> |
2784 | - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/> |
2785 | - <copy todir="${targetDistDirectory}"> |
2786 | - <fileset dir="config/bnd" includes="groovy*.bnd"/> |
2787 | - <filterset> |
2788 | - <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/> |
2789 | - </filterset> |
2790 | - </copy> |
2791 | - <property name="jarsToWrap" value="groovy.jar,groovy-all.jar" /> |
2792 | - <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true"> |
2793 | - <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
2794 | - </bndwrap> |
2795 | - <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
2796 | - <move todir="${targetDistDirectory}"> |
2797 | - <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/> |
2798 | - <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/> |
2799 | - </move> |
2800 | - <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/> |
2801 | - </target> |
2802 | - |
2803 | - <target name="skipOsgi" if="_skipOsgi_"> |
2804 | - <move todir="${targetDistDirectory}"> |
2805 | - <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/> |
2806 | - <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/> |
2807 | - </move> |
2808 | - </target> |
2809 | - |
2810 | - <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed" |
2811 | - description="Create an installation hierarchy in target/install."> |
2812 | - |
2813 | - <!-- |
2814 | - FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools) |
2815 | - ability to run faster incremental builds. |
2816 | - --> |
2817 | - <delete dir="${installDirectory}" quiet="true"/> |
2818 | - <mkdir dir="${installDirectory}"/> |
2819 | - |
2820 | - <!-- Install license files --> |
2821 | - <copy todir="${installDirectory}"> |
2822 | - <fileset dir="${basedir}"> |
2823 | - <include name="LICENSE.txt"/> |
2824 | - <include name="NOTICE.txt"/> |
2825 | - </fileset> |
2826 | - </copy> |
2827 | - <unzip dest="${installDirectory}"> |
2828 | - <patternset> |
2829 | - <include name="META-INF/*-LICENSE.txt"/> |
2830 | - </patternset> |
2831 | - <mapper type="flatten"/> |
2832 | - <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/> |
2833 | - </unzip> |
2834 | - <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/> |
2835 | - |
2836 | - <!-- Install generated artifacts and runtime dependencies --> |
2837 | - <mkdir dir="${installDirectory}/lib"/> |
2838 | - <copy todir="${installDirectory}/lib"> |
2839 | - <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/> |
2840 | - <fileset dir="${runtimeLibDirectory}" includes="*.jar"/> |
2841 | - </copy> |
2842 | - |
2843 | - <!-- Install the embeddable bits --> |
2844 | - <mkdir dir="${installDirectory}/embeddable"/> |
2845 | - <copy todir="${installDirectory}/embeddable"> |
2846 | - <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/> |
2847 | - </copy> |
2848 | - |
2849 | - <!-- Install configuration files --> |
2850 | - <mkdir dir="${installDirectory}/conf"/> |
2851 | - <copy toDir="${installDirectory}/conf"> |
2852 | - <fileset dir="${sourceDirectory}/conf" includes="*"/> |
2853 | - </copy> |
2854 | - |
2855 | - <!-- Install scripts --> |
2856 | - <mkdir dir="${installDirectory}/bin"/> |
2857 | - <copy toDir="${installDirectory}/bin"> |
2858 | - <fileset dir="${sourceDirectory}/bin" includes="*"/> |
2859 | - <filterset> |
2860 | - <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/> |
2861 | - </filterset> |
2862 | - </copy> |
2863 | - |
2864 | - <!-- Tweak scripts for platform compatibility --> |
2865 | - <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat"/> |
2866 | - <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/> |
2867 | - <chmod perm="ugo+x"> |
2868 | - <fileset dir="${installDirectory}/bin" includes="*,*.*"/> |
2869 | - </chmod> |
2870 | - </target> |
2871 | - |
2872 | - <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit" |
2873 | - description="Create the code style reports."> |
2874 | - <checkAndReport |
2875 | - reportDirectory="${reportsDirectory}/checkstyle" |
2876 | - sourceDirectory="${mainSourceDirectory}" |
2877 | - excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java"> |
2878 | - <path> |
2879 | - <pathelement path="${mainClassesDirectory}"/> |
2880 | - <path refid="testLibPath"/> |
2881 | - </path> |
2882 | - </checkAndReport> |
2883 | - </target> |
2884 | - |
2885 | - <target name="-compileTools" depends="-initGroovyc,compileMain"> |
2886 | - <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true"> |
2887 | - <classpath> |
2888 | - <path refid="toolsPath"/> |
2889 | - <pathelement path="${mainClassesDirectory}"/> |
2890 | - <path refid="compilePath"/> |
2891 | - </classpath> |
2892 | - </groovyc> |
2893 | - <copy todir="${toolsClassesDirectory}"> |
2894 | - <fileset dir="${toolsSourceDirectory}"> |
2895 | - <include name="**/*.html"/> |
2896 | - </fileset> |
2897 | - </copy> |
2898 | - </target> |
2899 | - |
2900 | - <target name="cruiseReportExtras"> |
2901 | - <mkdir dir="${cruiseReportRootDirectory}"/> |
2902 | - <copy todir="${cruiseReportRootDirectory}"> |
2903 | - <fileset dir="cruise/html"/> |
2904 | - </copy> |
2905 | - </target> |
2906 | - |
2907 | - <target name="cruiseInit"> |
2908 | - <property name="noTextReports" value="true"/> |
2909 | - <property name="forceCoverage" value="true"/> |
2910 | - <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/> |
2911 | - <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/> |
2912 | - </target> |
2913 | - |
2914 | - <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/> |
2915 | - |
2916 | - <target name="-docInit"> |
2917 | - <mkdir dir="${docsDirectory}"/> |
2918 | - <property name="docFooter" value="Copyright &copy; 2003-2009 The Codehaus. All rights reserved."/> |
2919 | - <property name="title" value="Groovy ${groovyVersion}"/> |
2920 | - </target> |
2921 | - |
2922 | - <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/> |
2923 | - |
2924 | - <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars" |
2925 | - description="Create the javadoc documentation."> |
2926 | - <javadoc destdir="${docsDirectory}/api" author="true" version="true" |
2927 | - windowtitle="${title}" doctitle="${title}" |
2928 | - encoding="ISO-8859-1" useexternalfile="true" source="1.5" |
2929 | - footer="${docFooter}" |
2930 | - maxmemory="${javaDoc_mx}" |
2931 | - > |
2932 | - <classpath> |
2933 | - <path path="${mainClassesDirectory}"/> |
2934 | - <path refid="compilePath"/> |
2935 | - </classpath> |
2936 | - <fileset dir="${mainSourceDirectory}" includes="**/*.java"/> |
2937 | - <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> |
2938 | - <link href="http://www.dpml.net/api/ant/1.7.0"/> |
2939 | - <link href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/> |
2940 | - <link href="http://java.sun.com/j2ee/1.4/docs/api"/> |
2941 | - <link href="http://www.antlr2.org/javadoc"/> |
2942 | - </javadoc> |
2943 | - <mkdir dir="${targetDistDirectory}"/> |
2944 | - <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
2945 | - <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar"> |
2946 | - <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
2947 | - </copy> |
2948 | - </target> |
2949 | - |
2950 | - <target name="groovydoc" depends="-fetchDependencies"> |
2951 | - <path id="groovydocpath"> |
2952 | - <path path="${mainClassesDirectory}"/> |
2953 | - <path refid="runtimePath"/> |
2954 | - <path path="${java.class.path}"/> |
2955 | - </path> |
2956 | - <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/> |
2957 | - </target> |
2958 | - |
2959 | - <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK"> |
2960 | - <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc"> |
2961 | - <classpath> |
2962 | - <path path="${mainClassesDirectory}"/> |
2963 | - <path refid="compilePath"/> |
2964 | - </classpath> |
2965 | - </taskdef> |
2966 | - <groovydoc |
2967 | - destdir="${docsDirectory}/gapi" |
2968 | - sourcepath="${mainSourceDirectory}" |
2969 | - packagenames="**.*" |
2970 | - use="true" |
2971 | - windowtitle="${title}" |
2972 | - doctitle="${title}" |
2973 | - header="${title}" |
2974 | - footer="${docFooter}" |
2975 | - overview="src/main/overview.html" |
2976 | - private="false"> |
2977 | - <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/j2se/1.5.0/docs/api"/> |
2978 | - <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/> |
2979 | - <link packages="org.junit.,junit.framework." href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/> |
2980 | - <link packages="antlr." href="http://www.antlr2.org/javadoc/"/> |
2981 | - <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/> |
2982 | - <link packages="groovy.,org.codehaus.groovy." href="http://groovy.codehaus.org/gapi/"/> |
2983 | - </groovydoc> |
2984 | - </target> |
2985 | - |
2986 | - <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation"> |
2987 | - <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true"> |
2988 | - <classpath> |
2989 | - <pathelement path="${toolsClassesDirectory}"/> |
2990 | - <path refid="toolsPath"/> |
2991 | - <pathelement path="${mainClassesDirectory}"/> |
2992 | - </classpath> |
2993 | - <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/> |
2994 | - <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/> |
2995 | - <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/> |
2996 | - </java> |
2997 | - <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/> |
2998 | - <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/> |
2999 | - </target> |
3000 | - |
3001 | - <target name="clean" description="Clean up build artifacts."> |
3002 | - <delete dir="${targetDirectory}" quiet="true"/> |
3003 | - <delete file="cobertura.ser" quiet="true" failonerror="false"/> |
3004 | - <delete quiet="true"> |
3005 | - <fileset dir="." includes="**/*~"/> |
3006 | - <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/> |
3007 | - <fileset dir="${javaParserDirectory}" includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/> |
3008 | - </delete> |
3009 | - </target> |
3010 | - |
3011 | - <target name="deploy" depends="-mavenDeployInit,install,doc" |
3012 | - description="Deploy jars to maven repository."> |
3013 | - <mavenDeploy version="${groovyVersion}" prefix="groovy"/> |
3014 | - <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/> |
3015 | - </target> |
3016 | - |
3017 | - <target name="installRepo" depends="-mavenInit,install,doc" |
3018 | - description="Deploy artifacts to local maven repository."> |
3019 | - <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/> |
3020 | - <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/> |
3021 | - </target> |
3022 | - |
3023 | - <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/> |
3024 | - |
3025 | - <target name="dist" depends="install,doc" description="Create everything needed for a distribution."> |
3026 | - <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip" |
3027 | - comment="The Groovy ${groovyVersion} binary distribution."> |
3028 | - |
3029 | - <!-- Make unix scripts executable --> |
3030 | - <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775"> |
3031 | - <include name="bin/*"/> |
3032 | - <exclude name="bin/*.*"/> |
3033 | - <exclude name="bin/startGroovy*"/> |
3034 | - </zipfileset> |
3035 | - |
3036 | - <!-- Include the other scripts as is --> |
3037 | - <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
3038 | - <include name="bin/*.*"/> |
3039 | - <include name="bin/startGroovy*"/> |
3040 | - </zipfileset> |
3041 | - |
3042 | - <!-- Include everything else as is too --> |
3043 | - <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
3044 | - <exclude name="bin/**"/> |
3045 | - <include name="**"/> |
3046 | - </zipfileset> |
3047 | - </zip> |
3048 | - |
3049 | - <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip" |
3050 | - comment="The Groovy ${groovyVersion} documentation distribution."> |
3051 | - <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/> |
3052 | - <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/> |
3053 | - </zip> |
3054 | - |
3055 | - <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip" |
3056 | - comment="The Groovy ${groovyVersion} source distribution."> |
3057 | - <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}"> |
3058 | - <!-- Exclude generated bits as well as any other bits that shouldn't make it in --> |
3059 | - <exclude name="${targetDirectory}/**"/> |
3060 | - <exclude name="classes/**"/> |
3061 | - <exclude name="cruise/**"/> |
3062 | - <exclude name=".clover/*"/> |
3063 | - <exclude name="local.build.properties"/> |
3064 | - <exclude name="cobertura.ser"/> |
3065 | - <exclude name="junitvmwatcher*.properties"/> |
3066 | - </zipfileset> |
3067 | - </zip> |
3068 | - </target> |
3069 | - |
3070 | -</project> |
3071 | |
3072 | === removed directory '.pc/ant-build.diff/config' |
3073 | === removed directory '.pc/ant-build.diff/config/ant' |
3074 | === removed file '.pc/ant-build.diff/config/ant/build-setup.xml' |
3075 | --- .pc/ant-build.diff/config/ant/build-setup.xml 2010-02-26 16:39:51 +0000 |
3076 | +++ .pc/ant-build.diff/config/ant/build-setup.xml 1970-01-01 00:00:00 +0000 |
3077 | @@ -1,78 +0,0 @@ |
3078 | -<?xml version="1.0"?> |
3079 | - |
3080 | -<!-- |
3081 | -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in |
3082 | -compliance with the License. You may obtain a copy of the License at |
3083 | - |
3084 | -http://www.apache.org/licenses/LICENSE-2.0 |
3085 | - |
3086 | -Unless required by applicable law or agreed to in writing, software distributed under the License is |
3087 | -distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
3088 | -implied. See the License for the specific language governing permissions and limitations under the License. |
3089 | - |
3090 | -This work is copyright by the author(s) and is part of a greater work collectively copyright by the |
3091 | -Groovy community. See the NOTICE.txt file distributed with this work for additional information. |
3092 | - |
3093 | -Author : Paul King |
3094 | -$Revision: 5519 $ ($LastChangedBy: paulk $) |
3095 | -$Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $ |
3096 | ---> |
3097 | - |
3098 | -<project name="build-setup" default="" basedir="../.."> |
3099 | - |
3100 | - <property name="bootstrapDirectory" location="bootstrap"/> |
3101 | - <property name="sourceDirectory" value="src"/> |
3102 | - <property name="wikiPdfDirectory" value="src"/> |
3103 | - <property name="mainSourceDirectory" location="${sourceDirectory}/main"/> |
3104 | - <property name="testSourceDirectory" value="${sourceDirectory}/test"/> |
3105 | - <property name="toolsSourceDirectory" location="${sourceDirectory}/tools"/> |
3106 | - <property name="examplesSourceDirectory" location="${sourceDirectory}/examples"/> |
3107 | - |
3108 | - <property name="targetDirectory" value="target"/> |
3109 | - <property name="installDirectory" value="${targetDirectory}/install"/> |
3110 | - <property name="cruiseReportRootDirectory" value="${targetDirectory}/root"/> |
3111 | - <property name="stagingDirectory" value="${targetDirectory}/staging"/> |
3112 | - <property name="docsDirectory" value="${targetDirectory}/html"/> |
3113 | - <property name="mainClassesDirectory" value="${targetDirectory}/classes"/> |
3114 | - <property name="testClassesDirectory" value="${targetDirectory}/test-classes"/> |
3115 | - <property name="toolsClassesDirectory" value="${targetDirectory}/tools-classes"/> |
3116 | - <property name="mainStubsDirectory" value="${targetDirectory}/stubs"/> |
3117 | - <property name="testStubsDirectory" value="${targetDirectory}/test-stubs"/> |
3118 | - |
3119 | - <property name="examplesClassesDirectory" value="${targetDirectory}/examples-classes"/> |
3120 | - <property name="instrumentedClassesDirectory" value="${targetDirectory}/instrumented-classes"/> |
3121 | - <property name="reportsDirectory" value="${targetDirectory}/reports"/> |
3122 | - <property name="targetLibDirectory" value="${targetDirectory}/lib"/> |
3123 | - <property name="targetDistDirectory" value="${targetDirectory}/dist"/> |
3124 | - |
3125 | - <property name="antlrDirectory" value="${mainSourceDirectory}/org/codehaus/groovy/antlr"/> |
3126 | - <property name="groovyParserDirectory" value="${antlrDirectory}/parser"/> |
3127 | - <property name="javaParserDirectory" value="${antlrDirectory}/java"/> |
3128 | - |
3129 | - <property name="compileLibDirectory" value="${targetLibDirectory}/compile"/> |
3130 | - <property name="testLibDirectory" value="${targetLibDirectory}/test"/> |
3131 | - <property name="runtimeLibDirectory" value="${targetLibDirectory}/runtime"/> |
3132 | - <property name="toolsLibDirectory" value="${targetLibDirectory}/tools"/> |
3133 | - <property name="examplesLibDirectory" value="${targetLibDirectory}/examples"/> |
3134 | - <property name="extrasLibDirectory" value="${targetLibDirectory}/extras"/> |
3135 | - <property name="junitRawDirectory" value="${targetDirectory}/test-reports"/> |
3136 | - <property name="junitReportsDirectory" value="${reportsDirectory}/junit"/> |
3137 | - <property name="relativePathToRealBasedir" value="."/> |
3138 | - |
3139 | - <macrodef name="antforked"> |
3140 | - <attribute name="target"/> |
3141 | - <attribute name="maxmemory" default="256m"/> |
3142 | - <attribute name="classpathref" default="runtimePath"/> |
3143 | - <sequential> |
3144 | - <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true"> |
3145 | - <classpath refid="@{classpathref}"/> |
3146 | - <jvmarg value="-Duser.home=${user.home}" /> |
3147 | - <arg value="@{target}"/> |
3148 | - <arg value="-DskipFetch=${skipFetch}"/> |
3149 | - <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/> |
3150 | - <arg value="-DtoolsLibDirectory=${toolsLibDirectory}" /> |
3151 | - </java> |
3152 | - </sequential> |
3153 | - </macrodef> |
3154 | - |
3155 | -</project> |
3156 | |
3157 | === modified file '.pc/applied-patches' |
3158 | --- .pc/applied-patches 2010-02-26 16:39:51 +0000 |
3159 | +++ .pc/applied-patches 2011-02-24 17:57:34 +0000 |
3160 | @@ -1,3 +1,3 @@ |
3161 | -start-scripts.patch |
3162 | -ant-build.diff |
3163 | -disable-bnd.diff |
3164 | +0001-start-scripts.patch |
3165 | +0002-ant-build.diff.patch |
3166 | +0003-disable-bnd.diff.patch |
3167 | |
3168 | === removed directory '.pc/disable-bnd.diff' |
3169 | === removed file '.pc/disable-bnd.diff/build.xml' |
3170 | --- .pc/disable-bnd.diff/build.xml 2010-02-26 16:39:51 +0000 |
3171 | +++ .pc/disable-bnd.diff/build.xml 1970-01-01 00:00:00 +0000 |
3172 | @@ -1,872 +0,0 @@ |
3173 | -<?xml version="1.0" encoding="UTF-8"?> |
3174 | - |
3175 | -<!-- |
3176 | -Ant build script for Groovy. |
3177 | - |
3178 | -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in |
3179 | -compliance with the License. You may obtain a copy of the License at |
3180 | - |
3181 | -http://www.apache.org/licenses/LICENSE-2.0 |
3182 | - |
3183 | -Unless required by applicable law or agreed to in writing, software distributed under the License is |
3184 | -distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
3185 | -implied. See the License for the specific language governing permissions and limitations under the License. |
3186 | - |
3187 | -This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on |
3188 | -behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information. |
3189 | - |
3190 | -Author : Russel Winder |
3191 | -Author : Paul King |
3192 | -$Revision: 18555 $ ($LastChangedBy: paulk $) |
3193 | -$Date: 2009-12-08 14:08:59 +0100 (Di, 08. Dez 2009) $ |
3194 | ---> |
3195 | - |
3196 | -<project name="Groovy" default="createJars" basedir="."> |
3197 | - |
3198 | - <property file="local.build.properties"/> |
3199 | - <property file="build.properties"/> |
3200 | - <property name="ant.requiredVersion" value="1.6.5"/> |
3201 | - |
3202 | - <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. --> |
3203 | - <import file="config/ant/build-setup.xml"/> |
3204 | - <import file="config/ant/build-checkstyle.xml"/> |
3205 | - <import file="config/ant/build-cobertura.xml"/> |
3206 | - |
3207 | - <path id="compilePath"> |
3208 | - <path path="${java.class.path}" /> |
3209 | - </path> |
3210 | - <path id="toolsPath"> |
3211 | - <path path="${java.class.path}" /> |
3212 | - </path> |
3213 | - |
3214 | - <condition property="_skipTests_"> |
3215 | - <or> |
3216 | - <equals arg1="${test}" arg2="false"/> |
3217 | - <istrue value="${skipTests}"/> |
3218 | - </or> |
3219 | - </condition> |
3220 | - |
3221 | - <condition property="_skipExamples_"> |
3222 | - <istrue value="${skipExamples}"/> |
3223 | - </condition> |
3224 | - |
3225 | - <condition property="_skipOsgi_"> |
3226 | - <istrue value="${skipOsgi}"/> |
3227 | - </condition> |
3228 | - |
3229 | - <condition property="_skipFetch_"> |
3230 | - <istrue value="${skipFetch}"/> |
3231 | - </condition> |
3232 | - |
3233 | - <condition property="_skipEmbeddable_"> |
3234 | - <istrue value="${skipEmbeddable}"/> |
3235 | - </condition> |
3236 | - |
3237 | - <condition property="groovy.build.vm4"> |
3238 | - <contains string="${ant.java.version}" substring="1.4"/> |
3239 | - </condition> |
3240 | - |
3241 | - <condition property="groovy.build.vm6"> |
3242 | - <contains string="${ant.java.version}" substring="1.6"/> |
3243 | - </condition> |
3244 | - |
3245 | - <presetdef name="javac"> |
3246 | - <javac memoryMaximumSize="500m"/> |
3247 | - </presetdef> |
3248 | - |
3249 | - <target name="-initCoverage"> |
3250 | - <condition property="_forceCoverage_"> |
3251 | - <and> |
3252 | - <not> |
3253 | - <istrue value="${skipTests}"/> |
3254 | - </not> |
3255 | - <istrue value="${forceCoverage}"/> |
3256 | - </and> |
3257 | - </condition> |
3258 | - </target> |
3259 | - |
3260 | - <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date."> |
3261 | - <mkdir dir="${groovyParserDirectory}"/> |
3262 | - <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}"> |
3263 | - <classpath refid="compilePath"/> |
3264 | - </antlr> |
3265 | - <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}"> |
3266 | - <classpath refid="compilePath"/> |
3267 | - </antlr> |
3268 | - </target> |
3269 | - |
3270 | - <target name="updatePolicy"> |
3271 | - <move file="security/groovy.policy" tofile="security/groovy.policy.template"/> |
3272 | - <copy tofile="security/groovy.policy"> |
3273 | - <fileset file="security/groovy.policy.template"/> |
3274 | - <filterset> |
3275 | - <filter token="relativePathToRealBasedir" value="${relativePathToRealBasedir}"/> |
3276 | - </filterset> |
3277 | - </copy> |
3278 | - </target> |
3279 | - |
3280 | - <target name="-init"> |
3281 | - <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/> |
3282 | - </target> |
3283 | - |
3284 | - <target name="-banner"> |
3285 | - <echo message="Java Runtime Environment version: ${java.version}"/> |
3286 | - <echo message="Java Runtime Environment vendor: ${java.vendor}"/> |
3287 | - <echo message="Ant version: ${ant.version}"/> |
3288 | - <echo message="Operating system name: ${os.name}"/> |
3289 | - <echo message="Operating system architecture: ${os.arch}"/> |
3290 | - <echo message="Operating system version: ${os.version}"/> |
3291 | - <echo message="Base directory: ${basedir}"/> |
3292 | - <echo message="Java Home: ${java.home}"/> |
3293 | - </target> |
3294 | - |
3295 | - <target name="-jvm14BuildWarning" if="groovy.build.vm4"> |
3296 | - <fail>Aborting! |
3297 | - |
3298 | -================================================ |
3299 | - ERROR: You must build Groovy with a 1.5+ JDK |
3300 | -================================================ |
3301 | - </fail> |
3302 | - </target> |
3303 | - |
3304 | - <target name="-checkAntVersion" depends="-excludeLegacyAntVersion" |
3305 | - description="Check that we are running on the required version of Ant."/> |
3306 | - |
3307 | - <target name="-excludeLegacyAntVersion"> |
3308 | - <!-- antversion didn't exist in early versions of ant so we have |
3309 | - a legacy check to provide a nicer error message in this case --> |
3310 | - <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+"> |
3311 | - <condition> |
3312 | - <or> |
3313 | - <contains string="${ant.version}" substring="1.1"></contains> |
3314 | - <contains string="${ant.version}" substring="1.2"></contains> |
3315 | - <contains string="${ant.version}" substring="1.3"></contains> |
3316 | - <contains string="${ant.version}" substring="1.4"></contains> |
3317 | - <contains string="${ant.version}" substring="1.5"></contains> |
3318 | - <and> |
3319 | - <contains string="${ant.version}" substring="1.6"></contains> |
3320 | - <not> |
3321 | - <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains> |
3322 | - </not> |
3323 | - </and> |
3324 | - </or> |
3325 | - </condition> |
3326 | - </fail> |
3327 | - </target> |
3328 | - |
3329 | - <!-- add back in if we make 1.7+ minimal required version for build again |
3330 | - <target name="-ensureRequiredAntVersion"> |
3331 | - <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/> |
3332 | - <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition> |
3333 | - </fail> |
3334 | - </target> |
3335 | - --> |
3336 | - |
3337 | - <target name="dgmConvert" depends="stagedcompile"> |
3338 | - <java classname="org.codehaus.groovy.tools.DgmConverter" |
3339 | - fork="yes" |
3340 | - failonerror="true"> |
3341 | - <classpath refid="compilePath"/> |
3342 | - <classpath path="${mainClassesDirectory}"/> |
3343 | - </java> |
3344 | - </target> |
3345 | - |
3346 | - <target name="compileMain" depends="stagedcompile,dgmConvert" |
3347 | - description="Compile the Java and Groovy code in the main source."> |
3348 | - </target> |
3349 | - |
3350 | - <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber"> |
3351 | - <mkdir dir="${mainClassesDirectory}"/> |
3352 | - <mkdir dir="${toolsClassesDirectory}"/> |
3353 | - |
3354 | - <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}" |
3355 | - deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath"> |
3356 | - <exclude name="groovy/ui/**/*.java"/> |
3357 | - </javac> |
3358 | - <antcall inheritrefs="true" target="-stagedcompile-groovy"/> |
3359 | - <antcall target="-includeResources"/> |
3360 | - </target> |
3361 | - |
3362 | - <target name="-stagedcompile-groovy" depends="-initGroovyc"> |
3363 | - <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" memorymaximumsize="${groovycMain_mx}"> |
3364 | - <classpath> |
3365 | - <pathelement path="${mainClassesDirectory}"/> |
3366 | - <path refid="compilePath"/> |
3367 | - </classpath> |
3368 | - <javac deprecation="on" debug="yes" source="1.5" target="1.5"/> |
3369 | - </groovyc> |
3370 | - </target> |
3371 | - |
3372 | - <property name="vm5GroovySourceFiles" value="**/*.groovy"/> |
3373 | - <property name="vm5JavaSourceFiles" value="**/*.java"/> |
3374 | - <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy"/> |
3375 | - |
3376 | - <target name="-initGroovyc"> |
3377 | - <path id="groovyMainClasses"> |
3378 | - <pathelement path="${mainClassesDirectory}"/> |
3379 | - <path refid="compilePath"/> |
3380 | - </path> |
3381 | - <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/> |
3382 | - </target> |
3383 | - |
3384 | - <target name="compileTest" depends="compileMain,compileTestOnly" |
3385 | - description="Compile the Java and Groovy code in the test source."/> |
3386 | - |
3387 | - <target name="-cleanTest"> |
3388 | - <delete dir="${testClassesDirectory}"/> |
3389 | - </target> |
3390 | - |
3391 | - <target name="compileTestOnly" unless="_skipTests_"> |
3392 | - <mkdir dir="${testClassesDirectory}"/> |
3393 | - <antcall inheritrefs="true" target="-compileTest"/> |
3394 | - </target> |
3395 | - |
3396 | - <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6"> |
3397 | - <groovyc srcdir="${testSourceDirectory}" |
3398 | - destdir="${testClassesDirectory}" |
3399 | - includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}" |
3400 | - excludes="${vm6GroovySourceFiles}" |
3401 | - fork="true" |
3402 | - memorymaximumsize="${groovycTest_mx}"> |
3403 | - <classpath> |
3404 | - <pathelement path="${testClassesDirectory}"/> |
3405 | - <path refid="groovyMainClasses"/> |
3406 | - <path refid="testLibPath"/> |
3407 | - </classpath> |
3408 | - <javac source="1.5" target="1.5" nowarn="on"/> |
3409 | - </groovyc> |
3410 | - </target> |
3411 | - |
3412 | - <target name="-compileTest_vm6" if="groovy.build.vm6"> |
3413 | - <groovyc srcdir="${testSourceDirectory}" |
3414 | - destdir="${testClassesDirectory}" |
3415 | - includes="${vm6GroovySourceFiles}" |
3416 | - fork="true" |
3417 | - memorymaximumsize="${groovycTest_mx}"> |
3418 | - <classpath> |
3419 | - <pathelement path="${testClassesDirectory}"/> |
3420 | - <path refid="groovyMainClasses"/> |
3421 | - <path refid="testLibPath"/> |
3422 | - </classpath> |
3423 | - <!-- currently not needed, add in if/when required --> |
3424 | - <!--<javac source="1.5" target="1.5" nowarn="on"/>--> |
3425 | - </groovyc> |
3426 | - </target> |
3427 | - |
3428 | - <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" unless="_skipExamples_" |
3429 | - description="Compile the Java and Groovy code in the examples source directory."> |
3430 | - <mkdir dir="${examplesClassesDirectory}"/> |
3431 | - <echo message="Compiling example code."/> |
3432 | - |
3433 | - <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy" |
3434 | - destdir="${examplesClassesDirectory}" |
3435 | - fork="true" |
3436 | - memorymaximumsize="${groovycExamples_mx}"> |
3437 | - <classpath> |
3438 | - <pathelement path="${mainClassesDirectory}"/> |
3439 | - <path refid="compilePath"/> |
3440 | - <path refid="examplesPath"/> |
3441 | - </classpath> |
3442 | - </groovyc> |
3443 | - <javac srcdir="${examplesSourceDirectory}" |
3444 | - destdir="${examplesClassesDirectory}" |
3445 | - source="1.5" |
3446 | - target="1.5" |
3447 | - fork="true"> |
3448 | - <classpath> |
3449 | - <pathelement path="${mainClassesDirectory}"/> |
3450 | - <pathelement path="${examplesClassesDirectory}"/> |
3451 | - <path refid="compilePath"/> |
3452 | - <path refid="examplesPath"/> |
3453 | - </classpath> |
3454 | - </javac> |
3455 | - <groovyc srcdir="${examplesSourceDirectory}" |
3456 | - destdir="${examplesClassesDirectory}" |
3457 | - fork="true" |
3458 | - memorymaximumsize="${groovycExamples_mx}" |
3459 | - excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java"> |
3460 | - <classpath> |
3461 | - <pathelement path="${mainClassesDirectory}"/> |
3462 | - <pathelement path="${examplesClassesDirectory}"/> |
3463 | - <path refid="compilePath"/> |
3464 | - <path refid="examplesPath"/> |
3465 | - </classpath> |
3466 | - <javac source="1.5" target="1.5"/> |
3467 | - </groovyc> |
3468 | - |
3469 | - </target> |
3470 | - |
3471 | - <target name="-initializeReports"> |
3472 | - <mkdir dir="${reportsDirectory}"/> |
3473 | - </target> |
3474 | - |
3475 | - <condition property="_shouldBeHeadless_"> |
3476 | - <or> |
3477 | - <istrue value="${java.awt.headless}"/> |
3478 | - <!--<os name="Mac OS X"/>--> |
3479 | - </or> |
3480 | - </condition> |
3481 | - |
3482 | - <target name="-testInit" depends="-initHeadless"> |
3483 | - <property name="headlessArg" value=""/> |
3484 | - <property name="junitJvmArgs" |
3485 | - value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props}"/> |
3486 | - </target> |
3487 | - |
3488 | - <target name="-initHeadless" if="_shouldBeHeadless_"> |
3489 | - <property name="headlessArg" value="-Djava.awt.headless=true"/> |
3490 | - <echo message="Setting headless mode ..."/> |
3491 | - </target> |
3492 | - |
3493 | - <target name="test" |
3494 | - depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed" |
3495 | - description="Compile and test all the classes (or just one class if testCase property is defined)."/> |
3496 | - |
3497 | - <target name="clean-test" depends="clean,test" |
3498 | - description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/> |
3499 | - |
3500 | - <condition property="_testOne_"> |
3501 | - <and> |
3502 | - <not> |
3503 | - <istrue value="${_skipTests_}"/> |
3504 | - </not> |
3505 | - <isset property="testCase"/> |
3506 | - </and> |
3507 | - </condition> |
3508 | - |
3509 | - <target name="-testOne" if="_testOne_" depends="-initGroovyc"> |
3510 | - <mkdir dir="${junitRawDirectory}"/> |
3511 | - <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
3512 | - <sysproperty key="apple.awt.UIElement" value="true"/> |
3513 | - <!-- keeps the dock from showing the AWT startup --> |
3514 | - <jvmarg line="${junitJvmArgs}"/> |
3515 | - <test name="${testCase}" todir="${junitRawDirectory}"/> |
3516 | - <formatter type="brief" usefile="false"/> |
3517 | - <classpath> |
3518 | - <pathelement path="${instrumentedClassesDirectory}"/> |
3519 | - <pathelement path="src/test"/> |
3520 | - <path refid="groovyMainClasses"/> |
3521 | - <path refid="testLibPath"/> |
3522 | - <pathelement path="${testClassesDirectory}"/> |
3523 | - <path refid="coberturaPath"/> |
3524 | - </classpath> |
3525 | - <assertions> |
3526 | - <enable/> |
3527 | - </assertions> |
3528 | - </junit> |
3529 | - </target> |
3530 | - |
3531 | - <condition property="_testAll_"> |
3532 | - <and> |
3533 | - <not> |
3534 | - <istrue value="${_skipTests_}"/> |
3535 | - </not> |
3536 | - <not> |
3537 | - <isset property="_testOne_"/> |
3538 | - </not> |
3539 | - </and> |
3540 | - </condition> |
3541 | - |
3542 | - <target name="-collectOptionalTests"> |
3543 | - <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-"> |
3544 | - <istrue value="${junit.network}"/> |
3545 | - </condition> |
3546 | - <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/> |
3547 | - </target> |
3548 | - |
3549 | - <target name="-collect15tests" unless="groovy.build.vm6"> |
3550 | - <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class,groovy/grape/*Test.class"/> |
3551 | - </target> |
3552 | - |
3553 | - <target name="-collect16tests" if="groovy.build.vm6"> |
3554 | - <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="groovy/grape/*Test.class"/> |
3555 | - </target> |
3556 | - |
3557 | - <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc"> |
3558 | - <mkdir dir="${junitRawDirectory}"/> |
3559 | - <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
3560 | - <jvmarg line="${junitJvmArgs}"/> |
3561 | - <sysproperty key="apple.awt.UIElement" value="true"/> |
3562 | - <!-- keeps the dock from showing the AWT startup --> |
3563 | - <formatter type="xml"/> |
3564 | - <formatter type="plain" unless="noTextReports"/> |
3565 | - <batchtest todir="${junitRawDirectory}"> |
3566 | - <fileset refid="ubertests.fileset"/> |
3567 | - <fileset refid="optionalTests.fileset"/> |
3568 | - </batchtest> |
3569 | - <classpath> |
3570 | - <pathelement path="${instrumentedClassesDirectory}"/> |
3571 | - <pathelement path="src/test"/> |
3572 | - <path refid="groovyMainClasses"/> |
3573 | - <path refid="testLibPath"/> |
3574 | - <pathelement path="${testClassesDirectory}"/> |
3575 | - <path refid="coberturaPath"/> |
3576 | - </classpath> |
3577 | - <assertions> |
3578 | - <enable/> |
3579 | - </assertions> |
3580 | - </junit> |
3581 | - <mkdir dir="${junitReportsDirectory}"/> |
3582 | - <junitreport tofile="${junitRawDirectory}/Results.xml"> |
3583 | - <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/> |
3584 | - <report format="frames" todir="${junitReportsDirectory}"/> |
3585 | - </junitreport> |
3586 | - </target> |
3587 | - |
3588 | - <target name="-reportTestFailed" depends="-coverageReport" if="testFailed"> |
3589 | - <fail message="Test failed, not processing further targets."/> |
3590 | - </target> |
3591 | - |
3592 | - <target name="-coverageInstrument" if="_forceCoverage_"> |
3593 | - <mkdir dir="${instrumentedClassesDirectory}"/> |
3594 | - <!--coberturaInstrument classesDirectory="${mainClassesDirectory}"/--> |
3595 | - </target> |
3596 | - |
3597 | - <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_"> |
3598 | - <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/--> |
3599 | - </target> |
3600 | - |
3601 | - <target name="-actuallyCreateJars" |
3602 | - depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar" |
3603 | - unless="testFailed"/> |
3604 | - |
3605 | - <target name="-makeManifest"> |
3606 | - <mkdir dir="${mainClassesDirectory}/META-INF"/> |
3607 | - <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/> |
3608 | - <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
3609 | - </target> |
3610 | - |
3611 | - <macrodef name="makeManifest"> |
3612 | - <attribute name="file"/> |
3613 | - <attribute name="bundleEnvironment" default="J2SE-1.5"/> |
3614 | - <sequential> |
3615 | - <manifest file="@{file}"> |
3616 | - <attribute name="Built-By" value="${user.name}"/> |
3617 | - <attribute name="Extension-Name" value="groovy"/> |
3618 | - <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
3619 | - <attribute name="Specification-Version" value="${groovyVersion}"/> |
3620 | - <attribute name="Specification-Vendor" value="The Codehaus"/> |
3621 | - <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
3622 | - <attribute name="Implementation-Version" value="${groovyVersion}"/> |
3623 | - <attribute name="Implementation-Vendor" value="The Codehaus"/> |
3624 | - <attribute name="Bundle-ManifestVersion" value="2" /> |
3625 | - <attribute name="Bundle-Name" value="Groovy Runtime" /> |
3626 | - <attribute name="Bundle-Description" value="Groovy Runtime" /> |
3627 | - <attribute name="Bundle-Version" value="${groovyBundleVersion}" /> |
3628 | - <attribute name="Bundle-Vendor" value="The Codehaus" /> |
3629 | - <attribute name="Bundle-ClassPath" value="." /> |
3630 | - <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}" /> |
3631 | - <attribute name="Eclipse-BuddyPolicy" value="dependent"/> |
3632 | - <attribute name="Eclipse-LazyStart" value="true"/> |
3633 | - <attribute name="DynamicImport-Package" value="*"/> |
3634 | - </manifest> |
3635 | - </sequential> |
3636 | - </macrodef> |
3637 | - |
3638 | - <target name="-includeResources" depends="-includeGroovyDocTemplates"> |
3639 | - <copy todir="${mainClassesDirectory}"> |
3640 | - <fileset dir="${mainSourceDirectory}"> |
3641 | - <include name="META-INF/services/*"/> |
3642 | - <include name="groovy/grape/*.xml"/> |
3643 | - <include name="groovy/ui/*.properties"/> |
3644 | - <include name="groovy/ui/**/*.png"/> |
3645 | - <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/> |
3646 | - <include name="org/codehaus/groovy/tools/shell/**/*.properties"/> |
3647 | - <include name="org/codehaus/groovy/tools/shell/**/*.xml"/> |
3648 | - <include name="org/codehaus/groovy/antlib.xml"/> |
3649 | - </fileset> |
3650 | - </copy> |
3651 | - <antcall target="-includeReleaseInfo"/> |
3652 | - </target> |
3653 | - |
3654 | - <target name="-includeReleaseInfo"> |
3655 | - <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" |
3656 | - todir="${mainClassesDirectory}/META-INF" overwrite="true"> |
3657 | - </copy> |
3658 | - <tstamp> |
3659 | - <format property="release.date" pattern="dd-MMM-yyyy"/> |
3660 | - <format property="release.time" pattern="hh:mm aa"/> |
3661 | - </tstamp> |
3662 | - <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties"> |
3663 | - <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/> |
3664 | - <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/> |
3665 | - <replacefilter token="##BuildDate##" value="${release.date}"/> |
3666 | - <replacefilter token="##BuildTime##" value="${release.time}"/> |
3667 | - </replace> |
3668 | - </target> |
3669 | - |
3670 | - <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates"> |
3671 | - <copy todir="${examplesClassesDirectory}"> |
3672 | - <fileset dir="${examplesSourceDirectory}"> |
3673 | - <include name="/swing/binding/caricature/resources/*.gif"/> |
3674 | - </fileset> |
3675 | - </copy> |
3676 | - </target> |
3677 | - |
3678 | - <target name="-includeGroovyDocTemplates"> |
3679 | - <copy todir="${mainClassesDirectory}"> |
3680 | - <fileset dir="${mainSourceDirectory}"> |
3681 | - <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/**/*.*"/> |
3682 | - </fileset> |
3683 | - <fileset dir="${toolsSourceDirectory}"> |
3684 | - <include name="org/codehaus/groovy/tools/groovy.ico"/> |
3685 | - </fileset> |
3686 | - </copy> |
3687 | - </target> |
3688 | - |
3689 | - <target name="-initializeJars" depends="test"> |
3690 | - <delete dir="${targetDistDirectory}" quiet="true"/> |
3691 | - <mkdir dir="${targetDistDirectory}"/> |
3692 | - </target> |
3693 | - |
3694 | - <target name="-createBaseJar" unless="testFailed"> |
3695 | - <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}" |
3696 | - excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
3697 | - <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/> |
3698 | - </target> |
3699 | - |
3700 | - <target name="-jarjarInit" unless="_skipEmbeddable_"> |
3701 | - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/> |
3702 | - </target> |
3703 | - |
3704 | - <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/> |
3705 | - |
3706 | - <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_"> |
3707 | - <delete dir="${stagingDirectory}" quiet="true"/> |
3708 | - <mkdir dir="${stagingDirectory}"/> |
3709 | - <unzip dest="${stagingDirectory}"> |
3710 | - <fileset dir="/usr/share/java"> |
3711 | - <include name="antlr.jar"/> |
3712 | - <include name="asm3.jar"/> |
3713 | - <include name="asm3-commons.jar"/> |
3714 | - <include name="asm3-tree.jar"/> |
3715 | - <include name="asm3-xml.jar"/> |
3716 | - </fileset> |
3717 | - </unzip> |
3718 | - <unzip dest="${stagingDirectory}"> |
3719 | - <fileset dir="${targetDistDirectory}"> |
3720 | - <include name="groovy.jar"/> |
3721 | - </fileset> |
3722 | - </unzip> |
3723 | - <copy toDir="${stagingDirectory}/META-INF"> |
3724 | - <fileset dir="${basedir}/config/build"> |
3725 | - <include name="*LICENSE.txt"/> |
3726 | - </fileset> |
3727 | - </copy> |
3728 | - <!-- add commons-cli --> |
3729 | - <unzip dest="${stagingDirectory}"> |
3730 | - <patternset> |
3731 | - <!-- no need for the manifest file, we have our own --> |
3732 | - <exclude name="META-INF/MANIFEST.MF"/> |
3733 | - </patternset> |
3734 | - <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/> |
3735 | - <fileset dir="/usr/share/java"> |
3736 | - <include name="commons-cli.jar"/> |
3737 | - </fileset> |
3738 | - </unzip> |
3739 | - <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" /> |
3740 | - <!-- TODO try to make use of jarjar keep ability --> |
3741 | - <jarjar jarfile="${targetDistDirectory}/groovy-all.jar" |
3742 | - manifest="${stagingDirectory}/META-INF/MANIFEST.MF"> |
3743 | - <fileset dir="${stagingDirectory}" excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
3744 | - <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/> |
3745 | - <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/> |
3746 | - <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/> |
3747 | - </jarjar> |
3748 | - <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true" |
3749 | - basedir="${stagingDirectory}" includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
3750 | - |
3751 | - <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" |
3752 | - tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/> |
3753 | - <delete dir="${stagingDirectory}" quiet="true"/> |
3754 | - </target> |
3755 | - |
3756 | - <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars" |
3757 | - description="Build Groovy and create the jarfiles."/> |
3758 | - |
3759 | - <target name="updateJarsForOsgi" unless="_skipOsgi_"> |
3760 | - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/> |
3761 | - <copy todir="${targetDistDirectory}"> |
3762 | - <fileset dir="config/bnd" includes="groovy*.bnd"/> |
3763 | - <filterset> |
3764 | - <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/> |
3765 | - </filterset> |
3766 | - </copy> |
3767 | - <property name="jarsToWrap" value="groovy.jar,groovy-all.jar" /> |
3768 | - <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true"> |
3769 | - <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
3770 | - </bndwrap> |
3771 | - <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
3772 | - <move todir="${targetDistDirectory}"> |
3773 | - <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/> |
3774 | - <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/> |
3775 | - </move> |
3776 | - <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/> |
3777 | - </target> |
3778 | - |
3779 | - <target name="skipOsgi" if="_skipOsgi_"> |
3780 | - <move todir="${targetDistDirectory}"> |
3781 | - <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/> |
3782 | - <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/> |
3783 | - </move> |
3784 | - </target> |
3785 | - |
3786 | - <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed" |
3787 | - description="Create an installation hierarchy in target/install."> |
3788 | - |
3789 | - <!-- |
3790 | - FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools) |
3791 | - ability to run faster incremental builds. |
3792 | - --> |
3793 | - <delete dir="${installDirectory}" quiet="true"/> |
3794 | - <mkdir dir="${installDirectory}"/> |
3795 | - |
3796 | - <!-- Install license files --> |
3797 | - <copy todir="${installDirectory}"> |
3798 | - <fileset dir="${basedir}"> |
3799 | - <include name="LICENSE.txt"/> |
3800 | - <include name="NOTICE.txt"/> |
3801 | - </fileset> |
3802 | - </copy> |
3803 | - <unzip dest="${installDirectory}"> |
3804 | - <patternset> |
3805 | - <include name="META-INF/*-LICENSE.txt"/> |
3806 | - </patternset> |
3807 | - <mapper type="flatten"/> |
3808 | - <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/> |
3809 | - </unzip> |
3810 | - <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/> |
3811 | - |
3812 | - <!-- Install generated artifacts and runtime dependencies --> |
3813 | - <mkdir dir="${installDirectory}/lib"/> |
3814 | - <copy todir="${installDirectory}/lib"> |
3815 | - <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/> |
3816 | - </copy> |
3817 | - |
3818 | - <!-- Install the embeddable bits --> |
3819 | - <mkdir dir="${installDirectory}/embeddable"/> |
3820 | - <copy todir="${installDirectory}/embeddable"> |
3821 | - <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/> |
3822 | - </copy> |
3823 | - |
3824 | - <!-- Install configuration files --> |
3825 | - <mkdir dir="${installDirectory}/conf"/> |
3826 | - <copy toDir="${installDirectory}/conf"> |
3827 | - <fileset dir="${sourceDirectory}/conf" includes="*"/> |
3828 | - </copy> |
3829 | - |
3830 | - <!-- Install scripts --> |
3831 | - <mkdir dir="${installDirectory}/bin"/> |
3832 | - <copy toDir="${installDirectory}/bin"> |
3833 | - <fileset dir="${sourceDirectory}/bin" includes="*"/> |
3834 | - <filterset> |
3835 | - <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/> |
3836 | - </filterset> |
3837 | - </copy> |
3838 | - |
3839 | - <!-- Tweak scripts for platform compatibility --> |
3840 | - <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat"/> |
3841 | - <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/> |
3842 | - <chmod perm="ugo+x"> |
3843 | - <fileset dir="${installDirectory}/bin" includes="*,*.*"/> |
3844 | - </chmod> |
3845 | - </target> |
3846 | - |
3847 | - <target name="checkstyle" depends="-init,-initializeReports" |
3848 | - description="Create the code style reports."> |
3849 | - <checkAndReport |
3850 | - reportDirectory="${reportsDirectory}/checkstyle" |
3851 | - sourceDirectory="${mainSourceDirectory}" |
3852 | - excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java"> |
3853 | - <path> |
3854 | - <pathelement path="${mainClassesDirectory}"/> |
3855 | - <path refid="testLibPath"/> |
3856 | - </path> |
3857 | - </checkAndReport> |
3858 | - </target> |
3859 | - |
3860 | - <target name="-compileTools" depends="-initGroovyc,compileMain"> |
3861 | - <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true"> |
3862 | - <classpath> |
3863 | - <path refid="toolsPath"/> |
3864 | - <pathelement path="${mainClassesDirectory}"/> |
3865 | - <path refid="compilePath"/> |
3866 | - </classpath> |
3867 | - </groovyc> |
3868 | - <copy todir="${toolsClassesDirectory}"> |
3869 | - <fileset dir="${toolsSourceDirectory}"> |
3870 | - <include name="**/*.html"/> |
3871 | - </fileset> |
3872 | - </copy> |
3873 | - </target> |
3874 | - |
3875 | - <target name="cruiseReportExtras"> |
3876 | - <mkdir dir="${cruiseReportRootDirectory}"/> |
3877 | - <copy todir="${cruiseReportRootDirectory}"> |
3878 | - <fileset dir="cruise/html"/> |
3879 | - </copy> |
3880 | - </target> |
3881 | - |
3882 | - <target name="cruiseInit"> |
3883 | - <property name="noTextReports" value="true"/> |
3884 | - <property name="forceCoverage" value="true"/> |
3885 | - <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/> |
3886 | - <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/> |
3887 | - </target> |
3888 | - |
3889 | - <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/> |
3890 | - |
3891 | - <target name="-docInit"> |
3892 | - <mkdir dir="${docsDirectory}"/> |
3893 | - <property name="docFooter" value="Copyright &copy; 2003-2009 The Codehaus. All rights reserved."/> |
3894 | - <property name="title" value="Groovy ${groovyVersion}"/> |
3895 | - </target> |
3896 | - |
3897 | - <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/> |
3898 | - |
3899 | - <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars" |
3900 | - description="Create the javadoc documentation."> |
3901 | - <javadoc destdir="${docsDirectory}/api" author="true" version="true" |
3902 | - windowtitle="${title}" doctitle="${title}" |
3903 | - encoding="ISO-8859-1" useexternalfile="true" source="1.5" |
3904 | - footer="${docFooter}" |
3905 | - maxmemory="${javaDoc_mx}" |
3906 | - > |
3907 | - <classpath> |
3908 | - <path path="${mainClassesDirectory}"/> |
3909 | - <path refid="compilePath"/> |
3910 | - </classpath> |
3911 | - <fileset dir="${mainSourceDirectory}" includes="**/*.java"/> |
3912 | - <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> |
3913 | - <link href="http://www.dpml.net/api/ant/1.7.0"/> |
3914 | - <link href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/> |
3915 | - <link href="http://java.sun.com/j2ee/1.4/docs/api"/> |
3916 | - <link href="http://www.antlr2.org/javadoc"/> |
3917 | - </javadoc> |
3918 | - <mkdir dir="${targetDistDirectory}"/> |
3919 | - <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
3920 | - <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar"> |
3921 | - <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
3922 | - </copy> |
3923 | - </target> |
3924 | - |
3925 | - <target name="groovydoc"> |
3926 | - <path id="groovydocpath"> |
3927 | - <path path="${mainClassesDirectory}"/> |
3928 | - <path path="${java.class.path}"/> |
3929 | - </path> |
3930 | - <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/> |
3931 | - </target> |
3932 | - |
3933 | - <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK"> |
3934 | - <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc"> |
3935 | - <classpath> |
3936 | - <path path="${mainClassesDirectory}"/> |
3937 | - <path refid="compilePath"/> |
3938 | - </classpath> |
3939 | - </taskdef> |
3940 | - <groovydoc |
3941 | - destdir="${docsDirectory}/gapi" |
3942 | - sourcepath="${mainSourceDirectory}" |
3943 | - packagenames="**.*" |
3944 | - use="true" |
3945 | - windowtitle="${title}" |
3946 | - doctitle="${title}" |
3947 | - header="${title}" |
3948 | - footer="${docFooter}" |
3949 | - overview="src/main/overview.html" |
3950 | - private="false"> |
3951 | - <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/j2se/1.5.0/docs/api"/> |
3952 | - <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/> |
3953 | - <link packages="org.junit.,junit.framework." href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/> |
3954 | - <link packages="antlr." href="http://www.antlr2.org/javadoc/"/> |
3955 | - <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/> |
3956 | - <link packages="groovy.,org.codehaus.groovy." href="http://groovy.codehaus.org/gapi/"/> |
3957 | - </groovydoc> |
3958 | - </target> |
3959 | - |
3960 | - <target name="docGDK" depends="-compileTools" description="Create the GDK documentation"> |
3961 | - <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true"> |
3962 | - <classpath> |
3963 | - <pathelement path="${toolsClassesDirectory}"/> |
3964 | - <path refid="toolsPath"/> |
3965 | - <pathelement path="${mainClassesDirectory}"/> |
3966 | - </classpath> |
3967 | - <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/> |
3968 | - <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/> |
3969 | - <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/> |
3970 | - </java> |
3971 | - <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/> |
3972 | - <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/> |
3973 | - </target> |
3974 | - |
3975 | - <target name="clean" description="Clean up build artifacts."> |
3976 | - <delete dir="${targetDirectory}" quiet="true"/> |
3977 | - <delete file="cobertura.ser" quiet="true" failonerror="false"/> |
3978 | - <delete quiet="true"> |
3979 | - <fileset dir="." includes="**/*~"/> |
3980 | - <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/> |
3981 | - <fileset dir="${javaParserDirectory}" includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/> |
3982 | - </delete> |
3983 | - </target> |
3984 | - |
3985 | - <target name="deploy" depends="install,doc" |
3986 | - description="Deploy jars to maven repository."> |
3987 | - <mavenDeploy version="${groovyVersion}" prefix="groovy"/> |
3988 | - <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/> |
3989 | - </target> |
3990 | - |
3991 | - <target name="installRepo" depends="install,doc" |
3992 | - description="Deploy artifacts to local maven repository."> |
3993 | - <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/> |
3994 | - <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/> |
3995 | - </target> |
3996 | - |
3997 | - <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/> |
3998 | - |
3999 | - <target name="dist" depends="install,doc" description="Create everything needed for a distribution."> |
4000 | - <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip" |
4001 | - comment="The Groovy ${groovyVersion} binary distribution."> |
4002 | - |
4003 | - <!-- Make unix scripts executable --> |
4004 | - <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775"> |
4005 | - <include name="bin/*"/> |
4006 | - <exclude name="bin/*.*"/> |
4007 | - <exclude name="bin/startGroovy*"/> |
4008 | - </zipfileset> |
4009 | - |
4010 | - <!-- Include the other scripts as is --> |
4011 | - <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
4012 | - <include name="bin/*.*"/> |
4013 | - <include name="bin/startGroovy*"/> |
4014 | - </zipfileset> |
4015 | - |
4016 | - <!-- Include everything else as is too --> |
4017 | - <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}"> |
4018 | - <exclude name="bin/**"/> |
4019 | - <include name="**"/> |
4020 | - </zipfileset> |
4021 | - </zip> |
4022 | - |
4023 | - <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip" |
4024 | - comment="The Groovy ${groovyVersion} documentation distribution."> |
4025 | - <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/> |
4026 | - <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/> |
4027 | - </zip> |
4028 | - |
4029 | - <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip" |
4030 | - comment="The Groovy ${groovyVersion} source distribution."> |
4031 | - <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}"> |
4032 | - <!-- Exclude generated bits as well as any other bits that shouldn't make it in --> |
4033 | - <exclude name="${targetDirectory}/**"/> |
4034 | - <exclude name="classes/**"/> |
4035 | - <exclude name="cruise/**"/> |
4036 | - <exclude name=".clover/*"/> |
4037 | - <exclude name="local.build.properties"/> |
4038 | - <exclude name="cobertura.ser"/> |
4039 | - <exclude name="junitvmwatcher*.properties"/> |
4040 | - </zipfileset> |
4041 | - </zip> |
4042 | - </target> |
4043 | - |
4044 | -</project> |
4045 | |
4046 | === removed directory '.pc/start-scripts.patch' |
4047 | === removed directory '.pc/start-scripts.patch/src' |
4048 | === removed directory '.pc/start-scripts.patch/src/bin' |
4049 | === removed file '.pc/start-scripts.patch/src/bin/startGroovy' |
4050 | --- .pc/start-scripts.patch/src/bin/startGroovy 2010-02-26 16:39:51 +0000 |
4051 | +++ .pc/start-scripts.patch/src/bin/startGroovy 1970-01-01 00:00:00 +0000 |
4052 | @@ -1,272 +0,0 @@ |
4053 | -# -*- mode:sh -*- |
4054 | - |
4055 | -############################################################################## |
4056 | -## ## |
4057 | -## Groovy JVM Bootstrap for UN*X ## |
4058 | -## ## |
4059 | -############################################################################## |
4060 | - |
4061 | -## |
4062 | -## $Revision: 14460 $ |
4063 | -## $Date: 2008-12-17 12:36:49 +0100 (Mi, 17. Dez 2008) $ |
4064 | -## |
4065 | - |
4066 | -PROGNAME=`basename "$0"` |
4067 | - |
4068 | -#DIRNAME=`dirname "$0"` |
4069 | - |
4070 | -SCRIPT_PATH="$0" |
4071 | - |
4072 | -# Use the maximum available, or set MAX_FD != -1 to use that value. |
4073 | -MAX_FD="maximum" |
4074 | - |
4075 | -warn ( ) { |
4076 | - echo "${PROGNAME}: $*" |
4077 | -} |
4078 | - |
4079 | -die ( ) { |
4080 | - warn "$*" |
4081 | - exit 1 |
4082 | -} |
4083 | - |
4084 | -earlyInit ( ) { |
4085 | - return |
4086 | -} |
4087 | - |
4088 | -lateInit ( ) { |
4089 | - return |
4090 | -} |
4091 | - |
4092 | -GROOVY_STARTUP="$HOME/.groovy/startup" |
4093 | -if [ -r "$GROOVY_STARTUP" ] ; then |
4094 | - . "$GROOVY_STARTUP" |
4095 | -fi |
4096 | - |
4097 | -earlyInit |
4098 | - |
4099 | -# OS specific support (must be 'true' or 'false'). |
4100 | -cygwin=false |
4101 | -msys=false |
4102 | -darwin=false |
4103 | -case "`uname`" in |
4104 | - CYGWIN* ) |
4105 | - cygwin=true |
4106 | - ;; |
4107 | - Darwin* ) |
4108 | - darwin=true |
4109 | - ;; |
4110 | - MINGW* ) |
4111 | - msys=true |
4112 | - ;; |
4113 | -esac |
4114 | - |
4115 | -if [ "$1" = "-cp" -o "$1" = "-classpath" ] ; then |
4116 | - CP=$2 |
4117 | - shift 2 |
4118 | -fi |
4119 | - |
4120 | -# Attempt to set JAVA_HOME if it's not already set. |
4121 | -if [ -z "$JAVA_HOME" ] ; then |
4122 | - if $darwin ; then |
4123 | - [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home" |
4124 | - [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home" |
4125 | - else |
4126 | - javaExecutable="`which javac`" |
4127 | - [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME." |
4128 | - # readlink(1) is not available as standard on Solaris 10. |
4129 | - readLink=`which readlink` |
4130 | - [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME." |
4131 | - javaExecutable="`readlink -f \"$javaExecutable\"`" |
4132 | - javaHome="`dirname \"$javaExecutable\"`" |
4133 | - javaHome=`expr "$javaHome" : '\(.*\)/bin'` |
4134 | - JAVA_HOME="$javaHome" |
4135 | - export JAVA_HOME |
4136 | - |
4137 | - fi |
4138 | -fi |
4139 | - |
4140 | -# For Cygwin, ensure paths are in UNIX format before anything is touched. |
4141 | -if $cygwin ; then |
4142 | - [ -n "$GROOVY_HOME" ] && GROOVY_HOME=`cygpath --unix "$GROOVY_HOME"` |
4143 | - [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"` |
4144 | - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` |
4145 | - [ -n "$CP" ] && CP=`cygpath --path --unix "$CP"` |
4146 | -else |
4147 | - if [ -n "$GROOVY_HOME" -a `expr "$GROOVY_HOME":'\/$'` ] ; then |
4148 | - GROOVY_HOME=`echo $GROOVY_HOME | sed -e 's/\/$//'` |
4149 | - fi |
4150 | -fi |
4151 | - |
4152 | -# For MSYS, ensure paths are in appropriate format. |
4153 | -if $msys |
4154 | -then |
4155 | - [ -n "$JAVA_HOME" ] && JAVA_HOME=`( cd "$JAVA_HOME" ; pwd )` |
4156 | -fi |
4157 | - |
4158 | -# Attempt to set GROOVY_HOME if it is not already set. |
4159 | -if [ -z "$GROOVY_HOME" -o ! -d "$GROOVY_HOME" ] ; then |
4160 | - # Resolve links: $0 may be a link to groovy's home. |
4161 | - PRG="$0" |
4162 | - # Need this for relative symlinks. |
4163 | - while [ -h "$PRG" ] ; do |
4164 | - ls=`ls -ld "$PRG"` |
4165 | - link=`expr "$ls" : '.*-> \(.*\)$'` |
4166 | - if expr "$link" : '/.*' > /dev/null; then |
4167 | - PRG="$link" |
4168 | - else |
4169 | - PRG=`dirname "$PRG"`"/$link" |
4170 | - fi |
4171 | - done |
4172 | - SAVED="`pwd`" |
4173 | - cd "`dirname \"$PRG\"`/.." |
4174 | - GROOVY_HOME="`pwd -P`" |
4175 | - cd "$SAVED" |
4176 | -fi |
4177 | - |
4178 | -# Set the default Groovy config if no specific one is mentioned. |
4179 | -if [ -z "$GROOVY_CONF" ] ; then |
4180 | - GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf" |
4181 | -fi |
4182 | -STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@" |
4183 | - |
4184 | -# Create the final classpath. Setting a classpath using the -cp or -classpath option means not to use the |
4185 | -# global classpath. Groovy behaves then the same as the java interpreter |
4186 | -if [ -n "$CP" ] ; then |
4187 | - CP="$CP":. |
4188 | -elif [ -n "$CLASSPATH" ] ; then |
4189 | - CP="$CLASSPATH":. |
4190 | -else |
4191 | - CP=. |
4192 | -fi |
4193 | - |
4194 | -# Determine the Java command to use to start the JVM. |
4195 | -if [ -z "$JAVACMD" ] ; then |
4196 | - if [ -n "$JAVA_HOME" ] ; then |
4197 | - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then |
4198 | - # IBM's JDK on AIX uses strange locations for the executables |
4199 | - JAVACMD="$JAVA_HOME/jre/sh/java" |
4200 | - else |
4201 | - JAVACMD="$JAVA_HOME/bin/java" |
4202 | - fi |
4203 | - else |
4204 | - JAVACMD="java" |
4205 | - fi |
4206 | -fi |
4207 | -if [ ! -x "$JAVACMD" ] ; then |
4208 | - die "JAVA_HOME is not defined correctly, can not execute: $JAVACMD" |
4209 | -fi |
4210 | -if [ -z "$JAVA_HOME" ] ; then |
4211 | - warn "JAVA_HOME environment variable is not set" |
4212 | -fi |
4213 | - |
4214 | -# Increase the maximum file descriptors if we can. |
4215 | -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then |
4216 | - MAX_FD_LIMIT=`ulimit -H -n` |
4217 | - if [ $? -eq 0 ] ; then |
4218 | - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then |
4219 | - MAX_FD="$MAX_FD_LIMIT" |
4220 | - fi |
4221 | - ulimit -n $MAX_FD |
4222 | - if [ $? -ne 0 ] ; then |
4223 | - warn "Could not set maximum file descriptor limit: $MAX_FD" |
4224 | - fi |
4225 | - else |
4226 | - warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT" |
4227 | - fi |
4228 | -fi |
4229 | - |
4230 | -# Setup Profiler |
4231 | -useprofiler=false |
4232 | -if [ "$PROFILER" != "" ] ; then |
4233 | - if [ -r "$PROFILER" ] ; then |
4234 | - . $PROFILER |
4235 | - useprofiler=true |
4236 | - else |
4237 | - die "Profiler file not found: $PROFILER" |
4238 | - fi |
4239 | -fi |
4240 | - |
4241 | -# For Darwin, use classes.jar for TOOLS_JAR |
4242 | -TOOLS_JAR="$JAVA_HOME/lib/tools.jar" |
4243 | -#if $darwin; then |
4244 | -# TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar" |
4245 | -#fi |
4246 | - |
4247 | -# For Darwin, add GROOVY_APP_NAME to the JAVA_OPTS as -Xdock:name |
4248 | -if $darwin; then |
4249 | - JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GROOVY_APP_NAME" |
4250 | -# we may also want to set -Xdock:image |
4251 | -fi |
4252 | - |
4253 | -# For Cygwin, switch paths to Windows format before running java |
4254 | -if $cygwin ; then |
4255 | - GROOVY_HOME=`cygpath --mixed "$GROOVY_HOME"` |
4256 | - JAVA_HOME=`cygpath --mixed "$JAVA_HOME"` |
4257 | - GROOVY_CONF=`cygpath --mixed "$GROOVY_CONF"` |
4258 | - CP=`cygpath --path --mixed "$CP"` |
4259 | - TOOLS_JAR=`cygpath --mixed "$TOOLS_JAR"` |
4260 | - STARTER_CLASSPATH=`cygpath --path --mixed "$STARTER_CLASSPATH"` |
4261 | - |
4262 | - # We build the pattern for arguments to be converted via cygpath |
4263 | - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` |
4264 | - SEP="" |
4265 | - for dir in $ROOTDIRSRAW ; do |
4266 | - ROOTDIRS="$ROOTDIRS$SEP$dir" |
4267 | - SEP="|" |
4268 | - done |
4269 | - OURCYGPATTERN="(^($ROOTDIRS))" |
4270 | - # Add a user-defined pattern to the cygpath arguments |
4271 | - if [ "$GROOVY_CYGPATTERN" != "" ] ; then |
4272 | - OURCYGPATTERN="$OURCYGPATTERN|($GROOVY_CYGPATTERN)" |
4273 | - fi |
4274 | - # Now convert the arguments - kludge to limit ourselves to /bin/sh |
4275 | - i=0 |
4276 | - for arg in "$@" ; do |
4277 | - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` |
4278 | - if [ $CHECK -ne 0 ] ; then |
4279 | - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` |
4280 | - else |
4281 | - eval `echo args$i`="\"$arg\"" |
4282 | - fi |
4283 | - i=`expr $i + 1` |
4284 | - done |
4285 | - case $i in |
4286 | - 0) set -- ;; |
4287 | - 1) set -- "$args0" ;; |
4288 | - 2) set -- "$args0" "$args1" ;; |
4289 | - 3) set -- "$args0" "$args1" "$args2" ;; |
4290 | - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; |
4291 | - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; |
4292 | - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; |
4293 | - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; |
4294 | - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; |
4295 | - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; |
4296 | - esac |
4297 | - |
4298 | -fi |
4299 | - |
4300 | -startGroovy ( ) { |
4301 | - CLASS=$1 |
4302 | - shift |
4303 | - # Start the Profiler or the JVM |
4304 | - if $useprofiler ; then |
4305 | - runProfiler |
4306 | - else |
4307 | - exec "$JAVACMD" $JAVA_OPTS \ |
4308 | - -classpath "$STARTER_CLASSPATH" \ |
4309 | - -Dscript.name="$SCRIPT_PATH" \ |
4310 | - -Dprogram.name="$PROGNAME" \ |
4311 | - -Dgroovy.starter.conf="$GROOVY_CONF" \ |
4312 | - -Dgroovy.home="$GROOVY_HOME" \ |
4313 | - -Dtools.jar="$TOOLS_JAR" \ |
4314 | - $STARTER_MAIN_CLASS \ |
4315 | - --main $CLASS \ |
4316 | - --conf "$GROOVY_CONF" \ |
4317 | - --classpath "$CP" \ |
4318 | - "$@" |
4319 | - fi |
4320 | -} |
4321 | - |
4322 | -STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter |
4323 | - |
4324 | -lateInit |
4325 | |
4326 | === modified file 'build.properties' |
4327 | --- build.properties 2010-06-09 11:11:04 +0000 |
4328 | +++ build.properties 2011-02-24 17:57:34 +0000 |
4329 | @@ -1,8 +1,6 @@ |
4330 | -groovyVersion = 1.7.0 |
4331 | -groovyBundleVersion = 1.7.0 |
4332 | - |
4333 | -# uncomment the following line to enable java5 elements in the build |
4334 | -# groovy.build.vm5=true |
4335 | +groovyVersion = 1.7.4 |
4336 | +# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits) |
4337 | +groovyBundleVersion = 1.7.4 |
4338 | |
4339 | # Many people have reported problems testing UberTestCaseGroovySourceSubPackages, others have no difficulties with the default |
4340 | # values ant junit task uses. The decision has been taken to provide the values to try and cause the least |
4341 | |
4342 | === modified file 'build.xml' |
4343 | --- build.xml 2010-06-09 11:11:04 +0000 |
4344 | +++ build.xml 2011-02-24 17:57:34 +0000 |
4345 | @@ -17,8 +17,8 @@ |
4346 | |
4347 | Author : Russel Winder |
4348 | Author : Paul King |
4349 | -$Revision: 18555 $ ($LastChangedBy: paulk $) |
4350 | -$Date: 2009-12-08 14:08:59 +0100 (Di, 08. Dez 2009) $ |
4351 | +$Revision: 20245 $ ($LastChangedBy: paulk $) |
4352 | +$Date: 2010-06-07 02:45:33 +0200 (Mo, 07. Jun 2010) $ |
4353 | --> |
4354 | |
4355 | <project name="Groovy" default="createJars" basedir="."> |
4356 | @@ -50,6 +50,10 @@ |
4357 | <istrue value="${skipExamples}"/> |
4358 | </condition> |
4359 | |
4360 | + <condition property="_skipDocs_"> |
4361 | + <istrue value="${skipDocs}"/> |
4362 | + </condition> |
4363 | + |
4364 | <condition property="_skipOsgi_"> |
4365 | <istrue value="${skipOsgi}"/> |
4366 | </condition> |
4367 | @@ -62,6 +66,10 @@ |
4368 | <istrue value="${skipEmbeddable}"/> |
4369 | </condition> |
4370 | |
4371 | + <condition property="_forceServerSettings_"> |
4372 | + <istrue value="${forceServerSettings}"/> |
4373 | + </condition> |
4374 | + |
4375 | <condition property="groovy.build.vm4"> |
4376 | <contains string="${ant.java.version}" substring="1.4"/> |
4377 | </condition> |
4378 | @@ -95,16 +103,6 @@ |
4379 | </antlr> |
4380 | </target> |
4381 | |
4382 | - <target name="updatePolicy"> |
4383 | - <move file="security/groovy.policy" tofile="security/groovy.policy.template"/> |
4384 | - <copy tofile="security/groovy.policy"> |
4385 | - <fileset file="security/groovy.policy.template"/> |
4386 | - <filterset> |
4387 | - <filter token="relativePathToRealBasedir" value="${relativePathToRealBasedir}"/> |
4388 | - </filterset> |
4389 | - </copy> |
4390 | - </target> |
4391 | - |
4392 | <target name="-init"> |
4393 | <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/> |
4394 | </target> |
4395 | @@ -162,33 +160,32 @@ |
4396 | </target> |
4397 | --> |
4398 | |
4399 | - <target name="dgmConvert" depends="stagedcompile"> |
4400 | - <java classname="org.codehaus.groovy.tools.DgmConverter" |
4401 | - fork="yes" |
4402 | - failonerror="true"> |
4403 | - <classpath refid="compilePath"/> |
4404 | - <classpath path="${mainClassesDirectory}"/> |
4405 | - </java> |
4406 | - </target> |
4407 | - |
4408 | - <target name="compileMain" depends="stagedcompile,dgmConvert" |
4409 | + <target name="compileMain" depends="stagedcompile" |
4410 | description="Compile the Java and Groovy code in the main source."> |
4411 | </target> |
4412 | |
4413 | <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber"> |
4414 | <mkdir dir="${mainClassesDirectory}"/> |
4415 | <mkdir dir="${toolsClassesDirectory}"/> |
4416 | + <mkdir dir="${mainClassesDirectory}/META-INF"/> |
4417 | |
4418 | <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}" |
4419 | deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath"> |
4420 | <exclude name="groovy/ui/**/*.java"/> |
4421 | </javac> |
4422 | + <java classname="org.codehaus.groovy.tools.DgmConverter" |
4423 | + fork="yes" |
4424 | + failonerror="true"> |
4425 | + <classpath refid="compilePath"/> |
4426 | + <classpath path="${mainClassesDirectory}"/> |
4427 | + </java> |
4428 | <antcall inheritrefs="true" target="-stagedcompile-groovy"/> |
4429 | <antcall target="-includeResources"/> |
4430 | </target> |
4431 | |
4432 | <target name="-stagedcompile-groovy" depends="-initGroovyc"> |
4433 | - <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" memorymaximumsize="${groovycMain_mx}"> |
4434 | + <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" |
4435 | + memorymaximumsize="${groovycMain_mx}"> |
4436 | <classpath> |
4437 | <pathelement path="${mainClassesDirectory}"/> |
4438 | <path refid="compilePath"/> |
4439 | @@ -199,7 +196,7 @@ |
4440 | |
4441 | <property name="vm5GroovySourceFiles" value="**/*.groovy"/> |
4442 | <property name="vm5JavaSourceFiles" value="**/*.java"/> |
4443 | - <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy"/> |
4444 | + <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy,org/codehaus/groovy/**/vm6/*Test.groovy"/> |
4445 | |
4446 | <target name="-initGroovyc"> |
4447 | <path id="groovyMainClasses"> |
4448 | @@ -253,7 +250,8 @@ |
4449 | </groovyc> |
4450 | </target> |
4451 | |
4452 | - <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" unless="_skipExamples_" |
4453 | + <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" |
4454 | + unless="_skipExamples_" |
4455 | description="Compile the Java and Groovy code in the examples source directory."> |
4456 | <mkdir dir="${examplesClassesDirectory}"/> |
4457 | <echo message="Compiling example code."/> |
4458 | @@ -269,10 +267,10 @@ |
4459 | </classpath> |
4460 | </groovyc> |
4461 | <javac srcdir="${examplesSourceDirectory}" |
4462 | - destdir="${examplesClassesDirectory}" |
4463 | - source="1.5" |
4464 | - target="1.5" |
4465 | - fork="true"> |
4466 | + destdir="${examplesClassesDirectory}" |
4467 | + source="1.5" |
4468 | + target="1.5" |
4469 | + fork="true"> |
4470 | <classpath> |
4471 | <pathelement path="${mainClassesDirectory}"/> |
4472 | <pathelement path="${examplesClassesDirectory}"/> |
4473 | @@ -281,7 +279,7 @@ |
4474 | </classpath> |
4475 | </javac> |
4476 | <groovyc srcdir="${examplesSourceDirectory}" |
4477 | - destdir="${examplesClassesDirectory}" |
4478 | + destdir="${examplesClassesDirectory}" |
4479 | fork="true" |
4480 | memorymaximumsize="${groovycExamples_mx}" |
4481 | excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java"> |
4482 | @@ -310,7 +308,7 @@ |
4483 | <target name="-testInit" depends="-initHeadless"> |
4484 | <property name="headlessArg" value=""/> |
4485 | <property name="junitJvmArgs" |
4486 | - value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props}"/> |
4487 | + value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props} -DjavadocAssertion.src.dir=./src/main"/> |
4488 | </target> |
4489 | |
4490 | <target name="-initHeadless" if="_shouldBeHeadless_"> |
4491 | @@ -336,7 +334,8 @@ |
4492 | |
4493 | <target name="-testOne" if="_testOne_" depends="-initGroovyc"> |
4494 | <mkdir dir="${junitRawDirectory}"/> |
4495 | - <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
4496 | + <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" |
4497 | + maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
4498 | <sysproperty key="apple.awt.UIElement" value="true"/> |
4499 | <!-- keeps the dock from showing the AWT startup --> |
4500 | <jvmarg line="${junitJvmArgs}"/> |
4501 | @@ -375,16 +374,17 @@ |
4502 | </target> |
4503 | |
4504 | <target name="-collect15tests" unless="groovy.build.vm6"> |
4505 | - <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class,groovy/grape/*Test.class"/> |
4506 | + <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class"/> |
4507 | </target> |
4508 | |
4509 | <target name="-collect16tests" if="groovy.build.vm6"> |
4510 | - <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="groovy/grape/*Test.class"/> |
4511 | + <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class"/> |
4512 | </target> |
4513 | |
4514 | <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc"> |
4515 | <mkdir dir="${junitRawDirectory}"/> |
4516 | - <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
4517 | + <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" |
4518 | + maxmemory="${groovyJUnit_mx}" dir="${basedir}"> |
4519 | <jvmarg line="${junitJvmArgs}"/> |
4520 | <sysproperty key="apple.awt.UIElement" value="true"/> |
4521 | <!-- keeps the dock from showing the AWT startup --> |
4522 | @@ -433,12 +433,12 @@ |
4523 | <target name="-makeManifest"> |
4524 | <mkdir dir="${mainClassesDirectory}/META-INF"/> |
4525 | <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/> |
4526 | - <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
4527 | - </target> |
4528 | + <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/> |
4529 | + </target> |
4530 | |
4531 | <macrodef name="makeManifest"> |
4532 | - <attribute name="file"/> |
4533 | - <attribute name="bundleEnvironment" default="J2SE-1.5"/> |
4534 | + <attribute name="file"/> |
4535 | + <attribute name="bundleEnvironment" default="J2SE-1.5"/> |
4536 | <sequential> |
4537 | <manifest file="@{file}"> |
4538 | <attribute name="Built-By" value="${user.name}"/> |
4539 | @@ -449,13 +449,13 @@ |
4540 | <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/> |
4541 | <attribute name="Implementation-Version" value="${groovyVersion}"/> |
4542 | <attribute name="Implementation-Vendor" value="The Codehaus"/> |
4543 | - <attribute name="Bundle-ManifestVersion" value="2" /> |
4544 | - <attribute name="Bundle-Name" value="Groovy Runtime" /> |
4545 | - <attribute name="Bundle-Description" value="Groovy Runtime" /> |
4546 | - <attribute name="Bundle-Version" value="${groovyBundleVersion}" /> |
4547 | - <attribute name="Bundle-Vendor" value="The Codehaus" /> |
4548 | - <attribute name="Bundle-ClassPath" value="." /> |
4549 | - <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}" /> |
4550 | + <attribute name="Bundle-ManifestVersion" value="2"/> |
4551 | + <attribute name="Bundle-Name" value="Groovy Runtime"/> |
4552 | + <attribute name="Bundle-Description" value="Groovy Runtime"/> |
4553 | + <attribute name="Bundle-Version" value="${groovyBundleVersion}"/> |
4554 | + <attribute name="Bundle-Vendor" value="The Codehaus"/> |
4555 | + <attribute name="Bundle-ClassPath" value="."/> |
4556 | + <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}"/> |
4557 | <attribute name="Eclipse-BuddyPolicy" value="dependent"/> |
4558 | <attribute name="Eclipse-LazyStart" value="true"/> |
4559 | <attribute name="DynamicImport-Package" value="*"/> |
4560 | @@ -472,26 +472,27 @@ |
4561 | <include name="groovy/ui/**/*.png"/> |
4562 | <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/> |
4563 | <include name="org/codehaus/groovy/tools/shell/**/*.properties"/> |
4564 | + <include name="org/codehaus/groovy/tools/groovydoc/**/*.properties"/> |
4565 | <include name="org/codehaus/groovy/tools/shell/**/*.xml"/> |
4566 | <include name="org/codehaus/groovy/antlib.xml"/> |
4567 | </fileset> |
4568 | </copy> |
4569 | - <antcall target="-includeReleaseInfo"/> |
4570 | + <antcall target="-includeReleaseInfo"/> |
4571 | </target> |
4572 | |
4573 | <target name="-includeReleaseInfo"> |
4574 | - <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" |
4575 | - todir="${mainClassesDirectory}/META-INF" overwrite="true"> |
4576 | + <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" |
4577 | + todir="${mainClassesDirectory}/META-INF" overwrite="true"> |
4578 | </copy> |
4579 | - <tstamp> |
4580 | - <format property="release.date" pattern="dd-MMM-yyyy"/> |
4581 | - <format property="release.time" pattern="hh:mm aa"/> |
4582 | - </tstamp> |
4583 | + <tstamp> |
4584 | + <format property="release.date" pattern="dd-MMM-yyyy"/> |
4585 | + <format property="release.time" pattern="hh:mm aa"/> |
4586 | + </tstamp> |
4587 | <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties"> |
4588 | - <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/> |
4589 | - <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/> |
4590 | - <replacefilter token="##BuildDate##" value="${release.date}"/> |
4591 | - <replacefilter token="##BuildTime##" value="${release.time}"/> |
4592 | + <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/> |
4593 | + <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/> |
4594 | + <replacefilter token="##BuildDate##" value="${release.date}"/> |
4595 | + <replacefilter token="##BuildTime##" value="${release.time}"/> |
4596 | </replace> |
4597 | </target> |
4598 | |
4599 | @@ -506,7 +507,7 @@ |
4600 | <target name="-includeGroovyDocTemplates"> |
4601 | <copy todir="${mainClassesDirectory}"> |
4602 | <fileset dir="${mainSourceDirectory}"> |
4603 | - <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/**/*.*"/> |
4604 | + <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/*/*.*"/> |
4605 | </fileset> |
4606 | <fileset dir="${toolsSourceDirectory}"> |
4607 | <include name="org/codehaus/groovy/tools/groovy.ico"/> |
4608 | @@ -514,7 +515,7 @@ |
4609 | </copy> |
4610 | </target> |
4611 | |
4612 | - <target name="-initializeJars" depends="test"> |
4613 | + <target name="-initializeJars" depends="test" unless="_skipDocs_"> |
4614 | <delete dir="${targetDistDirectory}" quiet="true"/> |
4615 | <mkdir dir="${targetDistDirectory}"/> |
4616 | </target> |
4617 | @@ -564,23 +565,25 @@ |
4618 | <include name="commons-cli.jar"/> |
4619 | </fileset> |
4620 | </unzip> |
4621 | - <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" /> |
4622 | + <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/> |
4623 | <!-- TODO try to make use of jarjar keep ability --> |
4624 | <jarjar jarfile="${targetDistDirectory}/groovy-all.jar" |
4625 | manifest="${stagingDirectory}/META-INF/MANIFEST.MF"> |
4626 | - <fileset dir="${stagingDirectory}" excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
4627 | + <fileset dir="${stagingDirectory}" |
4628 | + excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
4629 | <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/> |
4630 | <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/> |
4631 | <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/> |
4632 | </jarjar> |
4633 | <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true" |
4634 | - basedir="${stagingDirectory}" includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
4635 | + basedir="${stagingDirectory}" |
4636 | + includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/> |
4637 | |
4638 | <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" |
4639 | tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/> |
4640 | <delete dir="${stagingDirectory}" quiet="true"/> |
4641 | </target> |
4642 | - |
4643 | + |
4644 | <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars" |
4645 | description="Build Groovy and create the jarfiles."/> |
4646 | |
4647 | @@ -592,8 +595,10 @@ |
4648 | <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/> |
4649 | </filterset> |
4650 | </copy> |
4651 | - <property name="jarsToWrap" value="groovy.jar,groovy-all.jar" /> |
4652 | - <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true"> |
4653 | + <property name="jarsToWrap" value="groovy.jar,groovy-all.jar"/> |
4654 | + <property name="runtimeJars" refid="runtimePath"/> |
4655 | + <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true" |
4656 | + classpath="${runtimeJars}"> |
4657 | <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
4658 | </bndwrap> |
4659 | <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/> |
4660 | @@ -663,9 +668,15 @@ |
4661 | <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/> |
4662 | </filterset> |
4663 | </copy> |
4664 | + <!-- icon --> |
4665 | + <copy todir="${installDirectory}/bin" flatten="true"> |
4666 | + <fileset dir="${toolsSourceDirectory}"> |
4667 | + <include name="org/codehaus/groovy/tools/groovy.ico"/> |
4668 | + </fileset> |
4669 | + </copy> |
4670 | |
4671 | <!-- Tweak scripts for platform compatibility --> |
4672 | - <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat"/> |
4673 | + <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat, *.icns"/> |
4674 | <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/> |
4675 | <chmod perm="ugo+x"> |
4676 | <fileset dir="${installDirectory}/bin" includes="*,*.*"/> |
4677 | @@ -718,30 +729,32 @@ |
4678 | |
4679 | <target name="-docInit"> |
4680 | <mkdir dir="${docsDirectory}"/> |
4681 | - <property name="docFooter" value="Copyright &copy; 2003-2009 The Codehaus. All rights reserved."/> |
4682 | + <property name="docFooter" value="Copyright &copy; 2003-2010 The Codehaus. All rights reserved."/> |
4683 | <property name="title" value="Groovy ${groovyVersion}"/> |
4684 | </target> |
4685 | |
4686 | <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/> |
4687 | |
4688 | - <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars" |
4689 | - description="Create the javadoc documentation."> |
4690 | + <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars" |
4691 | + unless="_skipDocs_" description="Create the javadoc documentation."> |
4692 | <javadoc destdir="${docsDirectory}/api" author="true" version="true" |
4693 | windowtitle="${title}" doctitle="${title}" |
4694 | encoding="ISO-8859-1" useexternalfile="true" source="1.5" |
4695 | footer="${docFooter}" |
4696 | + overview="src/main/overviewj.html" |
4697 | maxmemory="${javaDoc_mx}" |
4698 | - > |
4699 | + > |
4700 | <classpath> |
4701 | <path path="${mainClassesDirectory}"/> |
4702 | <path refid="compilePath"/> |
4703 | </classpath> |
4704 | <fileset dir="${mainSourceDirectory}" includes="**/*.java"/> |
4705 | - <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> |
4706 | + <link href="http://java.sun.com/javase/6/docs/api"/> |
4707 | <link href="http://www.dpml.net/api/ant/1.7.0"/> |
4708 | - <link href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/> |
4709 | + <link href="http://junit.sourceforge.net/junit3.8.1/javadoc"/> |
4710 | <link href="http://java.sun.com/j2ee/1.4/docs/api"/> |
4711 | <link href="http://www.antlr2.org/javadoc"/> |
4712 | + <link href="http://commons.apache.org/cli/api-release"/> |
4713 | </javadoc> |
4714 | <mkdir dir="${targetDistDirectory}"/> |
4715 | <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/> |
4716 | @@ -753,7 +766,7 @@ |
4717 | <target name="groovydoc"> |
4718 | <path id="groovydocpath"> |
4719 | <path path="${mainClassesDirectory}"/> |
4720 | - <path path="${java.class.path}"/> |
4721 | + <path refid="compilePath"/> |
4722 | </path> |
4723 | <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/> |
4724 | </target> |
4725 | @@ -774,14 +787,13 @@ |
4726 | doctitle="${title}" |
4727 | header="${title}" |
4728 | footer="${docFooter}" |
4729 | - overview="src/main/overview.html" |
4730 | - private="false"> |
4731 | - <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/j2se/1.5.0/docs/api"/> |
4732 | + overview="src/main/overview.html"> |
4733 | + <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/> |
4734 | + <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/javase/6/docs/api"/> |
4735 | <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/> |
4736 | - <link packages="org.junit.,junit.framework." href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/> |
4737 | - <link packages="antlr." href="http://www.antlr2.org/javadoc/"/> |
4738 | - <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/> |
4739 | - <link packages="groovy.,org.codehaus.groovy." href="http://groovy.codehaus.org/gapi/"/> |
4740 | + <link packages="org.junit.,junit." href="http://junit.sourceforge.net/junit3.8.1/javadoc"/> |
4741 | + <link packages="org.apache.commons.cli." href="http://commons.apache.org/cli/api-release"/> |
4742 | + <link packages="antlr." href="http://www.antlr2.org/javadoc"/> |
4743 | </groovydoc> |
4744 | </target> |
4745 | |
4746 | @@ -793,8 +805,14 @@ |
4747 | <pathelement path="${mainClassesDirectory}"/> |
4748 | </classpath> |
4749 | <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/> |
4750 | + <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/> |
4751 | + <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/> |
4752 | + <arg value="org.codehaus.groovy.runtime.XmlGroovyMethods"/> |
4753 | + <arg value="org.codehaus.groovy.runtime.EncodingGroovyMethods"/> |
4754 | + <arg value="org.codehaus.groovy.runtime.DateGroovyMethods"/> |
4755 | <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/> |
4756 | <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/> |
4757 | + <arg value="org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods"/> |
4758 | </java> |
4759 | <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/> |
4760 | <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/> |
4761 | @@ -806,22 +824,42 @@ |
4762 | <delete quiet="true"> |
4763 | <fileset dir="." includes="**/*~"/> |
4764 | <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/> |
4765 | - <fileset dir="${javaParserDirectory}" includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/> |
4766 | + <fileset dir="${javaParserDirectory}" |
4767 | + includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/> |
4768 | </delete> |
4769 | </target> |
4770 | |
4771 | <target name="deploy" depends="install,doc" |
4772 | - description="Deploy jars to maven repository."> |
4773 | + description="Deploy jars to maven repository."/> |
4774 | + |
4775 | + <target name="-deployDefault" unless="_forceServerSettings_"> |
4776 | <mavenDeploy version="${groovyVersion}" prefix="groovy"/> |
4777 | <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/> |
4778 | </target> |
4779 | |
4780 | + <target name="-deployFromServer" if="_forceServerSettings_"> |
4781 | + <copy tofile="target/settings.xml"> |
4782 | + <fileset file="config/maven/settings.xml"/> |
4783 | + <filterset> |
4784 | + <filter token="groovy.deploy.username" value="${groovy.deploy.username}"/> |
4785 | + <filter token="groovy.deploy.password" value="${groovy.deploy.password}"/> |
4786 | + </filterset> |
4787 | + </copy> |
4788 | + <mavenDeploySettings version="${groovyVersion}" prefix="groovy" settings="target/settings.xml"/> |
4789 | + <mavenDeploySettings version="${groovyVersion}" prefix="groovy-all" settings="target/settings.xml"/> |
4790 | + <delete file="target/settings.xml"/> |
4791 | + </target> |
4792 | + |
4793 | <target name="installRepo" depends="install,doc" |
4794 | description="Deploy artifacts to local maven repository."> |
4795 | <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/> |
4796 | <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/> |
4797 | </target> |
4798 | |
4799 | + <target name="quality" depends="install,checkstyle" description="install plus checkstyle"/> |
4800 | + |
4801 | + <target name="release" depends="deploy,compileExamples" description="deploy plus compileExamples"/> |
4802 | + |
4803 | <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/> |
4804 | |
4805 | <target name="dist" depends="install,doc" description="Create everything needed for a distribution."> |
4806 | |
4807 | === modified file 'config/ant/build-maven.xml' |
4808 | --- config/ant/build-maven.xml 2010-06-09 11:11:04 +0000 |
4809 | +++ config/ant/build-maven.xml 2011-02-24 17:57:34 +0000 |
4810 | @@ -14,8 +14,8 @@ |
4811 | Groovy community. See the NOTICE.txt file distributed with this work for additional information. |
4812 | |
4813 | Author : Paul King |
4814 | -$Revision: 17603 $ ($LastChangedBy: paulk $) |
4815 | -$Date: 2009-09-11 14:06:51 +0200 (Fr, 11. Sep 2009) $ |
4816 | +$Revision: 20148 $ ($LastChangedBy: paulk $) |
4817 | +$Date: 2010-05-28 17:22:26 +0200 (Fr, 28. Mai 2010) $ |
4818 | --> |
4819 | |
4820 | <project name="build-maven" default="" basedir="../.." xmlns:artifact="urn:maven-artifact-ant"> |
4821 | @@ -92,7 +92,7 @@ |
4822 | <fileset dir="${compileLibDirectory}" includes="**/*.jar"/> |
4823 | </path> |
4824 | <path id="runtimePath"> |
4825 | - <fileset dir="${runtimeLibDirectory}" includes="**/*.jar"/> |
4826 | + <fileset dir="${runtimeLibDirectory}" includes="**/*.jar"/> |
4827 | </path> |
4828 | <path id="testLibPath"> |
4829 | <fileset dir="${testLibDirectory}" includes="**/*.jar"/> |
4830 | @@ -103,9 +103,6 @@ |
4831 | <path id="examplesPath"> |
4832 | <fileset dir="${examplesLibDirectory}" includes="**/*.jar"/> |
4833 | </path> |
4834 | - <path id="jdk14ExtrasPath"> |
4835 | - <fileset dir="${extrasLibDirectory}" includes="**/*.jar"/> |
4836 | - </path> |
4837 | </target> |
4838 | |
4839 | <target name="-mavenDeployInit" depends="-mavenInit"> |
4840 | @@ -140,6 +137,19 @@ |
4841 | </sequential> |
4842 | </macrodef> |
4843 | |
4844 | + <macrodef name="mavenDeploySettings"> |
4845 | + <attribute name="version"/> |
4846 | + <attribute name="prefix"/> |
4847 | + <attribute name="settings"/> |
4848 | + <sequential> |
4849 | + <artifact:deploy file="${targetDistDirectory}/@{prefix}-@{version}.jar" settingsFile="@{settings}"> |
4850 | + <pom refid="@{prefix}.pom"/> |
4851 | + <attach file="${targetDistDirectory}/@{prefix}-@{version}-sources.jar" classifier="sources"/> |
4852 | + <attach file="${targetDistDirectory}/@{prefix}-@{version}-javadoc.jar" classifier="javadoc"/> |
4853 | + </artifact:deploy> |
4854 | + </sequential> |
4855 | + </macrodef> |
4856 | + |
4857 | <macrodef name="mavenInstallRepo"> |
4858 | <attribute name="version"/> |
4859 | <attribute name="prefix"/> |
4860 | |
4861 | === removed file 'config/bnd/groovy-all-jdk14.bnd' |
4862 | --- config/bnd/groovy-all-jdk14.bnd 2009-05-06 14:05:59 +0000 |
4863 | +++ config/bnd/groovy-all-jdk14.bnd 1970-01-01 00:00:00 +0000 |
4864 | @@ -1,4 +0,0 @@ |
4865 | -version= @GROOVY_BUNDLE_VERSION@ |
4866 | --nouses= true |
4867 | -Export-Package= *;version=${version} |
4868 | -Import-Package= *;resolution:=optional |
4869 | |
4870 | === removed file 'config/bnd/groovy-jdk14.bnd' |
4871 | --- config/bnd/groovy-jdk14.bnd 2009-05-06 14:05:59 +0000 |
4872 | +++ config/bnd/groovy-jdk14.bnd 1970-01-01 00:00:00 +0000 |
4873 | @@ -1,4 +0,0 @@ |
4874 | -version= @GROOVY_BUNDLE_VERSION@ |
4875 | --nouses= true |
4876 | -Export-Package= *;version=${version} |
4877 | -Import-Package= antlr, org.objectweb.asm, net.sf.retrotranslator.runtime.java.lang, *;resolution:=optional |
4878 | |
4879 | === added file 'config/checkstyle/codeHeader.txt' |
4880 | --- config/checkstyle/codeHeader.txt 1970-01-01 00:00:00 +0000 |
4881 | +++ config/checkstyle/codeHeader.txt 2011-02-24 17:57:34 +0000 |
4882 | @@ -0,0 +1,15 @@ |
4883 | +^/\*$ |
4884 | +^ \* Copyright (\([cC]\) )?\d\d\d\d(-\d\d\d\d)? the original author or authors\.$ |
4885 | +^ \*$ |
4886 | +^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$ |
4887 | +^ \* you may not use this file except in compliance with the License\.$ |
4888 | +^ \* You may obtain a copy of the License at$ |
4889 | +^ \*$ |
4890 | +^ \* http://www\.apache\.org/licenses/LICENSE-2\.0$ |
4891 | +^ \*$ |
4892 | +^ \* Unless required by applicable law or agreed to in writing, software$ |
4893 | +^ \* distributed under the License is distributed on an "AS IS" BASIS,$ |
4894 | +^ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$ |
4895 | +^ \* See the License for the specific language governing permissions and$ |
4896 | +^ \* limitations under the License\.$ |
4897 | +^ \*.* |
4898 | \ No newline at end of file |
4899 | |
4900 | === modified file 'config/checkstyle/config.xml' |
4901 | --- config/checkstyle/config.xml 2009-10-27 15:04:33 +0000 |
4902 | +++ config/checkstyle/config.xml 2011-02-24 17:57:34 +0000 |
4903 | @@ -151,6 +151,9 @@ |
4904 | <!--</module>--> |
4905 | <!-- add below in eventually for consistency --> |
4906 | <!--<module name="ArrayTypeStyle"/>--> |
4907 | + <module name="RegexpHeader"> |
4908 | + <property name="headerFile" value="config/checkstyle/codeHeader.txt"/> |
4909 | + </module> |
4910 | </module> |
4911 | <module name="PackageHtml"/> |
4912 | <module name="au.com.redhillconsulting.simian.SimianCheck"> |
4913 | |
4914 | === modified file 'config/maven/groovy-tools.pom' |
4915 | --- config/maven/groovy-tools.pom 2010-06-09 11:11:04 +0000 |
4916 | +++ config/maven/groovy-tools.pom 2011-02-24 17:57:34 +0000 |
4917 | @@ -34,7 +34,7 @@ |
4918 | <dependency> |
4919 | <groupId>net.sourceforge.cobertura</groupId> |
4920 | <artifactId>cobertura</artifactId> |
4921 | - <version>1.9.3</version> |
4922 | + <version>1.9.4.1</version> |
4923 | <exclusions> |
4924 | <exclusion> |
4925 | <groupId>asm</groupId> |
4926 | @@ -60,12 +60,12 @@ |
4927 | <dependency> |
4928 | <groupId>com.thoughtworks.qdox</groupId> |
4929 | <artifactId>qdox</artifactId> |
4930 | - <version>1.10</version> |
4931 | + <version>1.12</version> |
4932 | </dependency> |
4933 | <dependency> |
4934 | <groupId>biz.aQute</groupId> |
4935 | <artifactId>bnd</artifactId> |
4936 | - <version>0.0.379</version> |
4937 | + <version>0.0.401</version> |
4938 | </dependency> |
4939 | </dependencies> |
4940 | <repositories> |
4941 | |
4942 | === added file 'config/maven/settings.xml' |
4943 | --- config/maven/settings.xml 1970-01-01 00:00:00 +0000 |
4944 | +++ config/maven/settings.xml 2011-02-24 17:57:34 +0000 |
4945 | @@ -0,0 +1,10 @@ |
4946 | +<?xml version="1.0"?> |
4947 | +<settings> |
4948 | + <servers> |
4949 | + <server> |
4950 | + <id>codehaus.org</id> |
4951 | + <username>@groovy.deploy.username@</username> |
4952 | + <password>@groovy.deploy.password@</password> |
4953 | + </server> |
4954 | + </servers> |
4955 | +</settings> |
4956 | \ No newline at end of file |
4957 | |
4958 | === modified file 'debian/README.Debian' |
4959 | --- debian/README.Debian 2009-08-02 23:12:29 +0000 |
4960 | +++ debian/README.Debian 2011-02-24 17:57:34 +0000 |
4961 | @@ -86,3 +86,22 @@ |
4962 | |
4963 | -- Ludovic Claude <ludovic.claude@laposte.net> Fri, 17 Jul 2009 00:33:18 +0100 |
4964 | |
4965 | +I have used the same build.xml as before, only adjusted some of the supplied |
4966 | +patches. The complete doc does fail, but javadoc is just fine. |
4967 | + |
4968 | +The jansi jar is needed for the build which I have installed manually. |
4969 | +Groovy comes with several jars, I am not so sure which one should be |
4970 | +supplied by this package or if there should be two conflicting ones |
4971 | +prepared: |
4972 | + |
4973 | +target/dist/groovy-all-1.7.3-sources.jar |
4974 | +target/dist/groovy-all.jar |
4975 | +target/dist/groovy-1.7.3-javadoc.jar |
4976 | +target/dist/groovy-all-1.7.3-javadoc.jar |
4977 | +target/dist/groovy.jar |
4978 | +target/dist/groovy-1.7.3-sources.jar |
4979 | + |
4980 | +Sorry of I could not do more, I am only debugging something else. |
4981 | + |
4982 | + -- Steffen Moeller <moeller@debian.org> Wed, 21 Jul 2010 15:37:49 +0200 |
4983 | + |
4984 | |
4985 | === modified file 'debian/changelog' |
4986 | --- debian/changelog 2010-12-09 14:11:14 +0000 |
4987 | +++ debian/changelog 2011-02-24 17:57:34 +0000 |
4988 | @@ -1,17 +1,49 @@ |
4989 | -groovy (1.7.0-3ubuntu2) natty; urgency=low |
4990 | - |
4991 | - * Updated debian/rules to include ant-nodeps to fix FTBFS (LP: #687974). |
4992 | - |
4993 | - -- James Page <james.page@canonical.com> Thu, 09 Dec 2010 14:11:14 +0000 |
4994 | - |
4995 | -groovy (1.7.0-3ubuntu1) maverick; urgency=low |
4996 | - |
4997 | - * Merge from debian testing. Remaining changes: |
4998 | - - debian/control, debian/rules: (Build-)Depend on libservlet2.5-java |
4999 | - instead of libservlet2.4-java |
5000 | - - debian/control: Remove useless runtime dependency on libclassworlds-java |
The diff has been truncated for viewing.