Skip to content

Commit 5b59c1c

Browse files
author
Martin Schwamberger
committed
Update build script
1 parent d33aa9c commit 5b59c1c

8 files changed

Lines changed: 111 additions & 66 deletions

File tree

‎android.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
33
<id>android</id>
44
<formats>
55
<format>zip</format>
66
</formats>
77
<includeBaseDirectory>false</includeBaseDirectory>
88
<fileSets>
99
<fileSet>
10-
<directory>${basedir}/lib/android/libs/</directory>
10+
<directory>${basedir}/dist/android/libs/</directory>
1111
<outputDirectory>/libs/</outputDirectory>
12-
<includes>
13-
<include>**/*</include>
14-
</includes>
12+
<includes>
13+
<include>**/*</include>
14+
</includes>
1515
</fileSet>
1616
<fileSet>
1717
<directory>${basedir}/include/</directory>
1818
<outputDirectory>/include/</outputDirectory>
19-
<includes>
20-
<include>**/*</include>
21-
</includes>
19+
<includes>
20+
<include>**/*</include>
21+
</includes>
2222
</fileSet>
2323
</fileSets>
2424
</assembly>

‎build-android.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function distribute_android {
157157
echo "Distribute Android"
158158

159159
local PLATFORM="Android"
160-
local NAME="$OPENSSL_NAME-$PLATFORM"
160+
local NAME="$PLATFORM"
161161
local DIR="$DIST_DIR/$NAME/openssl"
162162
local ANDROID_ABIS="arm64-v8a armeabi-v7a armeabi x86 x86_64"
163163

‎build-ios.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function distribute_ios() {
8989
echo "Distribute iOS"
9090

9191
local PLATFORM="iOS"
92-
local NAME="$OPENSSL_NAME-$PLATFORM"
92+
local NAME="$PLATFORM"
9393
local DIR="$DIST_DIR/$NAME/openssl"
9494
local FILES="libcrypto.a libssl.a"
9595
mkdir -p "$DIR/include"

‎crypto.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
3-
<id>crypto</id>
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
3+
<id>framework-crypto</id>
44
<formats>
55
<format>zip</format>
66
</formats>
77
<includeBaseDirectory>false</includeBaseDirectory>
88
<fileSets>
99
<fileSet>
10-
<directory>${basedir}/lib/ios/Crypto.framework/</directory>
10+
<directory>${basedir}/dist/Framework-iOS/Crypto.framework/</directory>
1111
<outputDirectory>/Crypto.framework/</outputDirectory>
12-
<includes>
13-
<include>**/*</include>
14-
</includes>
12+
<includes>
13+
<include>**/*</include>
14+
</includes>
1515
</fileSet>
16-
</fileSets>
16+
</fileSets>
1717
</assembly>

‎openssl-cpp.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
3+
<id>cpp-openssl</id>
4+
<formats>
5+
<format>zip</format>
6+
</formats>
7+
<includeBaseDirectory>false</includeBaseDirectory>
8+
<fileSets>
9+
<fileSet>
10+
<directory>${basedir}/dist/iOS</directory>
11+
<outputDirectory>/</outputDirectory>
12+
<includes>
13+
<include>**/*</include>
14+
</includes>
15+
</fileSet>
16+
</fileSets>
17+
</assembly>

‎openssl.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
3-
<id>openssl</id>
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
3+
<id>framework-openssl</id>
44
<formats>
55
<format>zip</format>
66
</formats>
77
<includeBaseDirectory>false</includeBaseDirectory>
88
<fileSets>
99
<fileSet>
10-
<directory>${basedir}/lib/ios/Openssl.framework/</directory>
10+
<directory>${basedir}/dist/Framework-iOS/Openssl.framework/</directory>
1111
<outputDirectory>/Openssl.framework/</outputDirectory>
12-
<includes>
13-
<include>**/*</include>
14-
</includes>
12+
<includes>
13+
<include>**/*</include>
14+
</includes>
1515
</fileSet>
1616
</fileSets>
1717
</assembly>

‎pom.xml‎

Lines changed: 61 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>de.letsdev.intern.openssl</groupId>
55
<artifactId>Openssl-mobile</artifactId>
66
<version>1.0.2o</version>
7-
7+
88
<name>Open ssl for mobile (android and iOS)</name>
9-
9+
1010
<scm>
1111
<url>http://dev1/gitlab/ld/lib-openssl</url>
1212
<connection>scm:git:git://dev1:ld/lib-openssl.git</connection>
@@ -38,10 +38,66 @@
3838
</developer>
3939
</developers>
4040

41+
<profiles>
42+
<profile>
43+
<id>ios</id>
44+
<build>
45+
<plugins>
46+
<plugin>
47+
<artifactId>maven-assembly-plugin</artifactId>
48+
<version>2.2-beta-5</version>
49+
<configuration>
50+
<descriptors>
51+
<descriptor>ssl.xml</descriptor>
52+
<descriptor>openssl.xml</descriptor>
53+
<descriptor>crypto.xml</descriptor>
54+
<descriptor>openssl-cpp.xml</descriptor>
55+
</descriptors>
56+
</configuration>
57+
<executions>
58+
<execution>
59+
<id>make-assembly</id>
60+
<phase>package</phase>
61+
<goals>
62+
<goal>single</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
</plugins>
68+
</build>
69+
</profile>
70+
<profile>
71+
<id>android</id>
72+
<build>
73+
<plugins>
74+
<plugin>
75+
<artifactId>maven-assembly-plugin</artifactId>
76+
<version>2.2-beta-5</version>
77+
<configuration>
78+
<descriptors>
79+
<descriptor>android.xml</descriptor>
80+
</descriptors>
81+
</configuration>
82+
<executions>
83+
<execution>
84+
<id>make-assembly</id>
85+
<phase>package</phase>
86+
<goals>
87+
<goal>single</goal>
88+
</goals>
89+
</execution>
90+
</executions>
91+
</plugin>
92+
</plugins>
93+
</build>
94+
</profile>
95+
</profiles>
96+
4197
<distributionManagement>
4298
<snapshotRepository>
4399
<id>snapshots</id>
44-
<name>Snapshots Intern</name> <!-- deploy snapshot versions only intern -->
100+
<name>Snapshots Intern</name> <!-- deploy snapshot versions only intern -->
45101
<url>${snapshots.url}</url>
46102
</snapshotRepository>
47103
<repository>
@@ -71,34 +127,6 @@
71127
</filesets>
72128
</configuration>
73129
</plugin>
74-
75-
<plugin>
76-
<artifactId>maven-assembly-plugin</artifactId>
77-
<version>2.2-beta-5</version>
78-
<configuration>
79-
<descriptors>
80-
<descriptor>ssl.xml</descriptor>
81-
<descriptor>openssl.xml</descriptor>
82-
<descriptor>crypto.xml</descriptor>
83-
<descriptor>android.xml</descriptor>
84-
</descriptors>
85-
</configuration>
86-
<executions>
87-
<execution>
88-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
89-
<phase>package</phase> <!-- append to the packaging phase. -->
90-
<goals>
91-
<goal>single</goal> <!-- goals == mojos -->
92-
</goals>
93-
</execution>
94-
</executions>
95-
</plugin>
96130
</plugins>
97131
</build>
98-
<dependencies>
99-
100-
</dependencies>
101-
102-
103-
104132
</project>

‎ssl.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
3-
<id>ssl</id>
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
3+
<id>framework-ssl</id>
44
<formats>
55
<format>zip</format>
66
</formats>
77
<includeBaseDirectory>false</includeBaseDirectory>
88
<fileSets>
99
<fileSet>
10-
<directory>${basedir}/lib/ios/Ssl.framework/</directory>
10+
<directory>${basedir}/dist/Framework-iOS/Ssl.framework/</directory>
1111
<outputDirectory>/Ssl.framework/</outputDirectory>
12-
<includes>
13-
<include>**/*</include>
14-
</includes>
12+
<includes>
13+
<include>**/*</include>
14+
</includes>
1515
</fileSet>
1616
</fileSets>
1717
</assembly>

0 commit comments

Comments
 (0)