Skip to content

Commit

Permalink
[Bug 526437] - Android SWT Libraries need to be forked
Browse files Browse the repository at this point in the history
    
Forked AOSP SWT according to "How to fork Android on GitHub"
(https://www.bitleaks.net/blog/fork-android-on-github/).
This project was revised to build the dependencies required by Andmore
as bundles using Maven/Tycho. The relevant parts were then merged to
Andmore as a new trunk named "andmore-swt". The enlarged Andmore project
has built to completion with Maven, but with integration test errors.
Regardless, the pull request is proceeding, as the android-swt part of
the build is successful.

Note the orginal Andmore target has been updated and incorporated in the
Tycho target platform configuration so both Maven and Eclipse can share
the same target. 

Also note that the original Android base module has been replaced by the
new SWT org.eclipse.andmore.swt module.
    
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437
Signed-off-by: Andrew Bowley <andrewbowley@aapt.net.au>
  • Loading branch information
Kys3rK1ng committed Nov 1, 2017
1 parent 282ae09 commit b650b80
Show file tree
Hide file tree
Showing 771 changed files with 129,344 additions and 362 deletions.
14 changes: 14 additions & 0 deletions andmore-swt/.gitignore
@@ -0,0 +1,14 @@
*~
*.bak
*.pyc
Thumbs.db
*.class
*.DS_Store
.gradle
/build
/out
/repo
.idea/workspace.xml
.idea/dictionaries/tnorbye.xml
bin

17 changes: 17 additions & 0 deletions andmore-swt/.project
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>andmore-parent</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions andmore-swt/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
4 changes: 4 additions & 0 deletions andmore-swt/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -0,0 +1 @@
/target/
23 changes: 23 additions & 0 deletions andmore-swt/features/org.eclipse.andmore.ddmuilib/.project
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.andmore.ddmuilib.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -0,0 +1,2 @@
bin.includes = feature.xml,\
feature.properties
Empty file.
46 changes: 46 additions & 0 deletions andmore-swt/features/org.eclipse.andmore.ddmuilib/feature.xml
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.andmore.ddmuilib.feature"
label="Andmore Android UI Dalvik Debug Monitor Service"
version="0.5.2.qualifier"
provider-name="Eclipse Andmore"
plugin="org.eclipse.andmore.ddmuilib"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

<description>
Android UI Dalvik Debug Monitor Service
</description>

<copyright>
Copyright (C) 2007-2011 The Android Open Source Project
</copyright>

<license url="%licenseURL">
%license
</license>

<requires>
<import plugin="org.eclipse.ui" version="0.0.0"/>
<import plugin="org.eclipse.core.runtime" version="0.0.0"/>
<import plugin="org.eclipse.ui.console"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.core.filesystem"/>
</requires>

<plugin
id="org.eclipse.andmore.swt"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.andmore.ddmuilib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>

<Match>
<Bug pattern="VA_FORMAT_STRING_USES_NEWLINE" />
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
</Match>
</FindBugsFilter>
48 changes: 48 additions & 0 deletions andmore-swt/features/org.eclipse.andmore.ddmuilib/pom.xml
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>org.eclipse.andmore.ddmuilib.feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>ddmuilib</name>

<parent>
<relativePath>../pom.xml</relativePath>
<groupId>org.eclipse.andmore</groupId>
<artifactId>swt-droid-parent</artifactId>
<version>0.5.2-SNAPSHOT</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<executions>
<execution>
<id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Empty file.
@@ -0,0 +1 @@
/target/
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.andmore.hierarchyviewer2lib.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -0,0 +1,2 @@
bin.includes = feature.xml,\
feature.properties
Empty file.
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.andmore.hierarchyviewer2lib.feature"
label="Andmore Android UI Hierarchy Viewer2 library"
version="0.5.2.qualifier"
provider-name="Eclipse Andmore"
plugin="org.eclipse.andmore.hierarchyviewer2lib"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

<description>
Android UI Hierarchy Viewer2 library
</description>

<copyright>
Copyright (C) 2007-2011 The Android Open Source Project
</copyright>

<license url="%licenseURL">
%license
</license>

<requires>
<import plugin="org.eclipse.ui" version="0.0.0"/>
<import plugin="org.eclipse.core.runtime" version="0.0.0"/>
<import plugin="org.eclipse.ui.console"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.core.filesystem"/>
</requires>

<plugin
id="org.eclipse.andmore.swt"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.andmore.ddmuilib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.andmore.hierarchyviewer2lib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>

<Match>
<Bug pattern="VA_FORMAT_STRING_USES_NEWLINE" />
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
</Match>
</FindBugsFilter>
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>org.eclipse.andmore.hierarchyviewer2lib.feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>hierarchyviewer2lib</name>

<parent>
<relativePath>../pom.xml</relativePath>
<groupId>org.eclipse.andmore</groupId>
<artifactId>swt-droid-parent</artifactId>
<version>0.5.2-SNAPSHOT</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<executions>
<execution>
<id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
@@ -0,0 +1 @@
/target/
23 changes: 23 additions & 0 deletions andmore-swt/features/org.eclipse.andmore.sdkstats/.project
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.andmore.sdkstats.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -0,0 +1,2 @@
bin.includes = feature.xml,\
feature.properties
Empty file.

0 comments on commit b650b80

Please sign in to comment.