diff options
Diffstat (limited to 'databases/cassandra3/files/patch-build.xml')
| -rw-r--r-- | databases/cassandra3/files/patch-build.xml | 119 |
1 files changed, 10 insertions, 109 deletions
diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml index c6bb818a1c09..6b406a5d7b31 100644 --- a/databases/cassandra3/files/patch-build.xml +++ b/databases/cassandra3/files/patch-build.xml @@ -1,14 +1,15 @@ ---- build.xml.orig 2020-10-20 17:07:48 UTC +--- build.xml.orig 2022-10-28 19:54:09 UTC +++ build.xml -@@ -23,6 +23,7 @@ +@@ -31,6 +31,8 @@ <property file="build.properties" /> <property file="build.properties.default" /> <property name="debuglevel" value="source,lines,vars"/> + <property name="pycmd" value="python"/> ++ <property name="rat.skip" value="true"/> <!-- default version and SCM information --> - <property name="base.version" value="3.11.9"/> -@@ -80,14 +81,14 @@ + <property name="base.version" value="3.11.14"/> +@@ -85,7 +87,7 @@ <condition property="version" value="${base.version}"> <isset property="release"/> </condition> @@ -17,82 +18,15 @@ <property name="version.properties.dir" value="${build.src.resources}/org/apache/cassandra/config/" /> <property name="final.name" value="${ant.project.name}-${version}"/> - - <!-- details of what version of Maven ANT Tasks to fetch --> - <property name="maven-ant-tasks.version" value="2.1.3" /> -- <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/> -+ <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/> - <property name="maven-ant-tasks.url" - value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" /> - <!-- details of how and which Maven repository we publish to --> -@@ -247,8 +248,7 @@ - <artifact:dependencies pathId="wikitext.classpath"> - <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/> - <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/> -- <remoteRepository refid="central"/> -- <remoteRepository refid="apache"/> -+ <localRepository path="${localm2}"/> - </artifact:dependencies> - <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" /> - <wikitext-to-html markupLanguage="Textile"> -@@ -261,6 +261,7 @@ - <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation"> +@@ -272,6 +274,7 @@ + <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip"> <exec executable="make" osfamily="unix" dir="${doc.dir}"> <arg value="html"/> + <arg value="PYTHON_CMD=${pycmd}"/> </exec> - <exec executable="cmd" osfamily="dos" dir="${doc.dir}"> - <arg value="/c"/> -@@ -303,10 +304,6 @@ - description="Initialize Maven ANT Tasks"> - <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" /> + </target> -- <!-- define the remote repositories we use --> -- <artifact:remoteRepository id="central" url="${artifact.remoteRepository.central}"/> -- <artifact:remoteRepository id="apache" url="${artifact.remoteRepository.apache}"/> -- - <macrodef name="install"> - <attribute name="pomFile"/> - <attribute name="file"/> -@@ -706,16 +703,14 @@ - filesetId="build-dependency-jars" - cacheDependencyRefs="true" - dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> -- <remoteRepository refid="central"/> -- <remoteRepository refid="apache"/> -+ <localRepository path="${localm2}"/> - </artifact:dependencies> - <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these --> - <artifact:dependencies pomRefId="build-deps-pom-sources" - sourcesFilesetId="build-dependency-sources" - cacheDependencyRefs="true" - dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml"> -- <remoteRepository refid="central"/> -- <remoteRepository refid="apache"/> -+ <localRepository path="${localm2}"/> - </artifact:dependencies> - <copy todir="${build.dir.lib}/jars"> - <fileset refid="build-dependency-jars"/> -@@ -728,7 +723,7 @@ - <!-- code coverage tools --> - <artifact:dependencies pomRefId="coverage-deps-pom" - filesetId="coverage-dependency-jars"> -- <remoteRepository refid="central"/> -+ <localRepository path="${localm2}"/> - </artifact:dependencies> - <copy todir="${build.dir.lib}/jars"> - <fileset refid="coverage-dependency-jars"/> -@@ -749,8 +744,7 @@ - sourcesFilesetId="test-dependency-sources" - cacheDependencyRefs="true" - dependencyRefsBuildFile="${build.dir}/test-dependencies.xml"> -- <remoteRepository refid="apache"/> -- <remoteRepository refid="central"/> -+ <localRepository path="${localm2}"/> - </artifact:dependencies> - <copy todir="${test.lib}/jars"> - <fileset refid="test-dependency-jars"/> -@@ -1045,6 +1039,88 @@ +@@ -924,6 +927,88 @@ </jar> </target> @@ -179,38 +113,5 @@ + </target> + <!-- creates release tarballs --> - <target name="artifacts" depends="jar,javadoc,gen-doc" + <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar" description="Create Cassandra release artifacts"> -@@ -1644,8 +1720,7 @@ - <target name="rat-init" depends="maven-ant-tasks-init"> - <artifact:dependencies pathId="rat.classpath"> - <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" /> -- <remoteRepository refid="central"/> -- <remoteRepository refid="apache"/> -+ <localRepository path="${localm2}"/> - </artifact:dependencies> - <typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/> - </target> -@@ -1794,8 +1869,8 @@ - <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false"> - <arg value="--all"/> - </exec> -- <!-- support for Mac OS X --> -- <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false"> -+ <!-- support for Mac OS X and FreeBSD --> -+ <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false"> - <arg value="-n"/> - <arg value="hw.ncpu"/> - </exec> -@@ -1815,6 +1890,11 @@ - <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false"> - <arg value="-n"/> - <arg value="hw.memsize"/> -+ </exec> -+ <!-- support for FreeBSD --> -+ <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false"> -+ <arg value="-n"/> -+ <arg value="hw.physmem"/> - </exec> - <echo message="Mem size : ${mem.size}"/> - </target> |