Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow use of nightly-smoke on a modified checkout, by passing skip for the svn revision 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1479976 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2013-05-07 16:39:54 +00:00
parent e86dce4e9c
commit d9712d9aa9
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.xml
View File

@ -281,7 +281,6 @@
<target name="nightly-smoke" description="Builds an unsigned release and smoke tests it" depends="clean,-env-JAVA7_HOME"> <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it" depends="clean,-env-JAVA7_HOME">
<fail unless="JAVA7_HOME">JAVA7_HOME property or environment variable is not defined.</fail> <fail unless="JAVA7_HOME">JAVA7_HOME property or environment variable is not defined.</fail>
<property name="svnversion.exe" value="svnversion" /> <property name="svnversion.exe" value="svnversion" />
<exec dir="." executable="${svnversion.exe}" outputproperty="fakeReleaseSvnRevision" failifexecutionfails="false"/>
<subant target="prepare-release-no-sign" inheritall="false" failonerror="true"> <subant target="prepare-release-no-sign" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" /> <fileset dir="lucene" includes="build.xml" />
<fileset dir="solr" includes="build.xml" /> <fileset dir="solr" includes="build.xml" />
@ -303,7 +302,7 @@
<arg value="-B"/> <arg value="-B"/>
<arg file="dev-tools/scripts/smokeTestRelease.py"/> <arg file="dev-tools/scripts/smokeTestRelease.py"/>
<arg value="${fakeRelease.uri}"/> <arg value="${fakeRelease.uri}"/>
<arg value="${fakeReleaseSvnRevision}"/> <arg value="skip"/>
<arg value="${fakeReleaseVersion}"/> <arg value="${fakeReleaseVersion}"/>
<arg file="${fakeReleaseTmp}"/> <arg file="${fakeReleaseTmp}"/>
<arg value="false"/> <arg value="false"/>

9
dev-tools/scripts/smokeTestRelease.py
View File

@ -198,8 +198,6 @@ def checkJARMetaData(desc, jarFile, svnRevision, version):
'Ant-Version: Apache Ant 1.8', 'Ant-Version: Apache Ant 1.8',
# Make sure .class files are 1.7 format: # Make sure .class files are 1.7 format:
'X-Compile-Target-JDK: 1.7', 'X-Compile-Target-JDK: 1.7',
# Make sure this matches the version and svn revision we think we are releasing:
'Implementation-Version: %s %s ' % (version, svnRevision),
'Specification-Version: %s' % version, 'Specification-Version: %s' % version,
# Make sure the release was compiled with 1.7: # Make sure the release was compiled with 1.7:
'Created-By: 1.7'): 'Created-By: 1.7'):
@ -207,6 +205,13 @@ def checkJARMetaData(desc, jarFile, svnRevision, version):
raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % \ raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % \
(desc, verify)) (desc, verify))
if svnRevision != 'skip':
# Make sure this matches the version and svn revision we think we are releasing:
verifyRevision = 'Implementation-Version: %s %s ' % (version, svnRevision)
if s.find(verifyRevision) == -1:
raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF (wrong svn revision?)' % \
(desc, verifyRevision))
notice = decodeUTF8(z.read(NOTICE_FILE_NAME)) notice = decodeUTF8(z.read(NOTICE_FILE_NAME))
license = decodeUTF8(z.read(LICENSE_FILE_NAME)) license = decodeUTF8(z.read(LICENSE_FILE_NAME))