Call non-Android Tor artifact simply tor-[version].zip

parent 76a715cf
......@@ -11,7 +11,7 @@ ADD install*.sh ./
ADD tor-versions.json ./
ADD utils.py ./
ADD template.pom ./
ADD template-linux.pom ./
ADD template-android.pom ./
RUN ./install.sh
......
......@@ -272,11 +272,9 @@ def create_pom_file(versions, platform='android'):
tor_version = get_tor_version(versions)
pom_name = get_pom_file_name(versions, platform)
if platform == 'android':
template = 'template.pom'
elif platform == 'linux':
template = 'template-linux.pom'
template = 'template-android.pom'
else:
raise RuntimeError("Unknown platform: %s" % platform)
template = 'template.pom'
with open(template, 'rt') as infile:
with open(os.path.join(REPO_DIR, pom_name), 'wt') as outfile:
for line in infile:
......
......@@ -2,14 +2,14 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.briarproject</groupId>
<artifactId>tor-linux</artifactId>
<artifactId>tor-android</artifactId>
<version>VERSION</version>
<url>https://torproject.org</url>
<description>Repo for building Tor for Linux.</description>
<url>https://github.com/n8fr8/tor-android</url>
<description>Repo for building Tor for Android.</description>
<licenses>
<license>
<name>BSD-3-clause</name>
<url>https://gitweb.torproject.org/tor.git/tree/LICENSE</url>
<url>https://github.com/n8fr8/tor-android/blob/master/LICENSE</url>
</license>
</licenses>
<developers>
......@@ -28,10 +28,15 @@
<name>Tor Project</name>
<email>frontdesk@rt.torproject.org</email>
</developer>
<developer>
<id>n8fr8</id>
<name>Nathan Freitas</name>
<email>nathan@guardianproject.info</email>
</developer>
</developers>
<scm>
<connection>scm:https://gitweb.torproject.org/tor.git/</connection>
<developerConnection>scm:git@gitweb.torproject.org/tor.git</developerConnection>
<url>scm:https://gitweb.torproject.org/tor.git</url>
<connection>scm:https://github.com/n8fr8/tor-android.git</connection>
<developerConnection>scm:git@github.com:n8fr8/tor-android.git</developerConnection>
<url>scm:https://github.com/n8fr8/tor-android</url>
</scm>
</project>
......@@ -2,14 +2,14 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.briarproject</groupId>
<artifactId>tor-android</artifactId>
<artifactId>tor-linux</artifactId>
<version>VERSION</version>
<url>https://github.com/n8fr8/tor-android</url>
<description>Repo for building Tor for Android.</description>
<url>https://torproject.org</url>
<description>Repo for building Tor for Linux.</description>
<licenses>
<license>
<name>BSD-3-clause</name>
<url>https://github.com/n8fr8/tor-android/blob/master/LICENSE</url>
<url>https://gitweb.torproject.org/tor.git/tree/LICENSE</url>
</license>
</licenses>
<developers>
......@@ -28,15 +28,10 @@
<name>Tor Project</name>
<email>frontdesk@rt.torproject.org</email>
</developer>
<developer>
<id>n8fr8</id>
<name>Nathan Freitas</name>
<email>nathan@guardianproject.info</email>
</developer>
</developers>
<scm>
<connection>scm:https://github.com/n8fr8/tor-android.git</connection>
<developerConnection>scm:git@github.com:n8fr8/tor-android.git</developerConnection>
<url>scm:https://github.com/n8fr8/tor-android</url>
<connection>scm:https://gitweb.torproject.org/tor.git/</connection>
<developerConnection>scm:git@gitweb.torproject.org/tor.git</developerConnection>
<url>scm:https://gitweb.torproject.org/tor.git</url>
</scm>
</project>
......@@ -42,13 +42,18 @@ def get_tor_version(versions):
return versions['tor'].split('-')[1]
def get_file_suffix(versions, platform):
version = get_tor_version(versions)
return "%s-%s" % (platform, version) if platform == "android" else version
def get_final_file_name(versions, platform='android'):
return 'tor-%s-%s.zip' % (platform, get_tor_version(versions))
return 'tor-%s.zip' % get_file_suffix(versions, platform)
def get_sources_file_name(versions, platform='android'):
return 'tor-%s-%s-sources.jar' % (platform, get_tor_version(versions))
return 'tor-%s-sources.jar' % get_file_suffix(versions, platform)
def get_pom_file_name(versions, platform='android'):
return 'tor-%s-%s.pom' % (platform, get_tor_version(versions))
return 'tor-%s.pom' % get_file_suffix(versions, platform)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment