[tor-commits] [orbot/master] removed eclipse/ant build files
n8fr8 at torproject.org
n8fr8 at torproject.org
Wed Oct 7 12:37:35 UTC 2020
commit dfd5d7a0e29f4fc9b028d9f806fe0d7fc8eb9c8d
Author: bim <dsnake at protonmail.com>
Date: Thu Aug 27 01:02:55 2020 -0400
removed eclipse/ant build files
---
.classpath | 13 -------
.project | 79 -----------------------------------------
add-proguard-release.xml | 46 ------------------------
bcdroid.manifest | 3 --
build.xml | 92 ------------------------------------------------
custom_rules.xml | 57 ------------------------------
6 files changed, 290 deletions(-)
diff --git a/.classpath b/.classpath
deleted file mode 100644
index 92080bb6..00000000
--- a/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
- <classpathentry kind="src" path="src">
- <attributes>
- <attribute name="ignore_optional_problems" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index 057168b2..00000000
--- a/.project
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Orbot</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- <nature>org.eclipse.cdt.core.cnature</nature>
- <nature>org.eclipse.cdt.core.ccnature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
- </natures>
- <filteredResources>
- <filter>
- <id>1451443416388</id>
- <name></name>
- <type>30</type>
- <matcher>
- <id>org.eclipse.ui.ide.multiFilter</id>
- <arguments>1.0-name-matches-false-false-external</arguments>
- </matcher>
- </filter>
- <filter>
- <id>1451443416398</id>
- <name></name>
- <type>26</type>
- <matcher>
- <id>org.eclipse.ui.ide.multiFilter</id>
- <arguments>1.0-name-matches-false-false-jni</arguments>
- </matcher>
- </filter>
- </filteredResources>
-</projectDescription>
diff --git a/add-proguard-release.xml b/add-proguard-release.xml
deleted file mode 100644
index aaf2ffb8..00000000
--- a/add-proguard-release.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- Proguard Properties -->
-<property name="obfuscate.dir" value="obf" />
-<property name="obfuscate.absolute.dir" location="${obfuscate.dir}" />
-<property name="android-jar-preobfuscate" value="${obfuscate.absolute.dir}/original.jar" />
-<property name="android-jar-postobfuscate" value="${obfuscate.absolute.dir}/postobf.jar" />
-<property name="out.dex.input.absolute.dir" value="${android-jar-postobfuscate}" />
-
-<!-- replaces the post-compile step from ant_rules_r3 -->
-<target name="-post-compile" depends="-dex-obfuscate,-dex-no-obfuscate">
-</target>
-
-<target name="-dex-no-obfuscate" unless="build.mode.release">
- <mkdir dir="${obfuscate.absolute.dir}" />
- <jar basedir="${out.dir}/classes" destfile="${android-jar-postobfuscate}" />
-</target>
-
-<!-- Converts this project's .class files into .dex files -->
-<target name="-dex-obfuscate" if="build.mode.release">
- <property name="proguard-jar" value="${proguard.dir}/proguard.jar" />
- <property name="proguard-conf.dir" value="" />
- <property name="proguard-conf.absolute.dir" location="${proguard-conf.dir}" />
- <property name="proguard-conf" value="${proguard-conf.absolute.dir}/procfg.txt" />
- <path id="fullclasspath">
- <path refid="android.target.classpath"/>
- <pathelement path="${external.libs.dir}"/>
- </path>
- <property name="libraryjarpath" refid="fullclasspath"/>
- <!-- Add Proguard Task -->
- <taskdef resource="proguard/ant/task.properties" classpath="${proguard-jar}" />
-
- <mkdir dir="${obfuscate.absolute.dir}" />
- <delete file="${android-jar-preobfuscate}"/>
- <delete file="${android-jar-postobfuscate}"/>
- <jar basedir="${out.classes.dir}" destfile="${android-jar-preobfuscate}" />
- <proguard>
- @${proguard-conf}
- -injars ${android-jar-preobfuscate}
- -outjars ${android-jar-postobfuscate}
- -libraryjars ${libraryjarpath}
- -dump ${obfuscate.absolute.dir}/dump.txt
- -printseeds ${obfuscate.absolute.dir}/seeds.txt
- -printusage ${obfuscate.absolute.dir}/usage.txt
- -printmapping ${obfuscate.absolute.dir}/mapping.txt
- </proguard>
-</target>
-
diff --git a/bcdroid.manifest b/bcdroid.manifest
deleted file mode 100644
index b6b37f4e..00000000
--- a/bcdroid.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Sealed: true
-
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 4b3d6660..00000000
--- a/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Orbot" default="help">
-
- <!-- The local.properties file is created and updated by the 'android' tool.
- It contains the path to the SDK. It should *NOT* be checked into
- Version Control Systems. -->
- <property file="local.properties" />
-
- <!-- The ant.properties file can be created by you. It is only edited by the
- 'android' tool to add properties to it.
- This is the place to change some Ant specific build properties.
- Here are some properties you may want to change/update:
-
- source.dir
- The name of the source directory. Default is 'src'.
- out.dir
- The name of the output directory. Default is 'bin'.
-
- For other overridable properties, look at the beginning of the rules
- files in the SDK, at tools/ant/build.xml
-
- Properties related to the SDK location or the project target should
- be updated using the 'android' tool with the 'update' action.
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems.
-
- -->
- <property file="ant.properties" />
-
- <!-- if sdk.dir was not set from one of the property file, then
- get it from the ANDROID_HOME env var.
- This must be done before we load project.properties since
- the proguard config can use sdk.dir -->
- <property environment="env" />
- <condition property="sdk.dir" value="${env.ANDROID_HOME}">
- <isset property="env.ANDROID_HOME" />
- </condition>
-
- <!-- The project.properties file is created and updated by the 'android'
- tool, as well as ADT.
-
- This contains project specific properties such as project target, and library
- dependencies. Lower level build properties are stored in ant.properties
- (or in .classpath for Eclipse projects).
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems. -->
- <loadproperties srcFile="project.properties" />
-
- <!-- quick check on sdk.dir -->
- <fail
- message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
- unless="sdk.dir"
- />
-
- <!--
- Import per project custom build rules if present at the root of the project.
- This is the place to put custom intermediary targets such as:
- -pre-build
- -pre-compile
- -post-compile (This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir})
- -post-package
- -post-build
- -pre-clean
- -->
- <import file="custom_rules.xml" optional="true" />
-
- <!-- Import the actual build file.
-
- To customize existing targets, there are two options:
- - Customize only one target:
- - copy/paste the target into this file, *before* the
- <import> task.
- - customize it to your needs.
- - Customize the whole content of build.xml
- - copy/paste the content of the rules files (minus the top node)
- into this file, replacing the <import> task.
- - customize to your needs.
-
- ***********************
- ****** IMPORTANT ******
- ***********************
- In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
- in order to avoid having your file be overridden by tools such as "android update project"
- -->
- <!-- version-tag: 1 -->
- <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/custom_rules.xml b/custom_rules.xml
deleted file mode 100644
index 5f473de4..00000000
--- a/custom_rules.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
- <target name="-getgitdetails" >
- <exec executable="git" outputproperty="git.describe">
- <arg value="describe"/>
- </exec>
- <exec executable="git" outputproperty="git.revision">
- <arg value="rev-parse"/>
- <arg value="HEAD"/>
- </exec>
- </target>
-
- <target name="rename-release-with-version-number" depends="-getgitdetails">
- <xmlproperty file="AndroidManifest.xml"
- prefix="themanifest"
- collapseAttributes="true"/>
- <!-- see ${sdk.dir}/tools/ant/build.xml -set-release-mode -->
- <property name="out.packaged.file"
- location="${out.absolute.dir}/${ant.project.name}-v${git.describe}-unsigned.apk" />
- <property name="out.final.file"
- location="${out.absolute.dir}/${ant.project.name}-v${git.describe}.apk" />
- </target>
-
- <target name="-set-release-mode"
- depends="rename-release-with-version-number,android_rules.-set-release-mode">
- <echo message="target: ${build.target}"></echo>
- </target>
-
- <target name="-post-package" depends="-getgitdetails">
- <property file="${sdk.dir}/tools/source.properties"/>
- <property name="meta.inf.dir" value="${out.dir}/META-INF"/>
- <property name="build.manifest.file" value="${meta.inf.dir}/BUILD.MF"/>
- <mkdir dir="${meta.inf.dir}"/>
- <manifest file="${build.manifest.file}">
- <attribute name="Implementation-Package-Name" value="${themanifest.manifest.package}"/>
- <attribute name="Implementation-Version-Name" value="${themanifest.manifest.android:versionName}"/>
- <attribute name="Implementation-Version-Code" value="${themanifest.manifest.android:versionCode}"/>
- <attribute name="Git-Revision" value="${git.revision}"/>
- <attribute name="Android-SDK-Release" value="${Pkg.Revision}"/>
- <attribute name="Android-SDK-Host-OS" value="${Archive.HostOs}"/>
- <attribute name="Android-SDK-aapt" value="${aapt}"/>
- <attribute name="Android-SDK-zipalign" value="${zipalign}"/>
- </manifest>
- <condition property="build.is.debug" value="true" else="false">
- <equals arg1="${build.target}" arg2="debug" />
- </condition>
- <!-- adding BUILD.MF breaks debug builds, but not releases -->
- <if condition="${build.is.debug}">
- <else>
- <jar update="true" destfile="${out.packaged.file}">
- <fileset dir="${out.dir}" includes="META-INF/BUILD.MF"/>
- </jar>
- </else>
- </if>
- </target>
-</project>
More information about the tor-commits
mailing list