Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Easy Signing #94

Merged
merged 4 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public class JnigenExtension {

Action<RobovmBuildConfig> robovm;
JnigenBindingGeneratorExtension generator;
JnigenSigningExtension signing = new JnigenSigningExtension();

@Inject
public JnigenExtension (Project project) {
Expand All @@ -96,6 +97,10 @@ public void nativeCodeGenerator (Action<NativeCodeGeneratorConfig> container) {
container.execute(nativeCodeGeneratorConfig);
}

public void signing (Action<JnigenSigningExtension> container) {
container.execute(signing);
}

public void all (Action<BuildTarget> container) {
this.all = container;
}
Expand Down Expand Up @@ -258,6 +263,10 @@ private void checkForTasksToAdd (BuildTarget target) {
jnigenBuildTask.setBuildTarget(target);
jnigenBuildTask.dependsOn(jnigenTask);

JnigenSignTask jnigenSignTask = project.getTasks().create("jnigenSign" + os.name() + "_" + architecture.getDisplayName() + bitness.name(), JnigenSignTask.class, this);
jnigenSignTask.setBuildTarget(target);
jnigenSignTask.dependsOn(jnigenBuildTask);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we maybe add the jnigenSign task conditionally, based on whether signing was configured?
And if signing is configured, adding something like:
jnigenBuildTask.finalizedBy(jnigenSignTask)?
Conceptionally I feel like signing belongs more to the packaging step, but I guess that doesn't work well with the current jnigen setup that packages everything on a linux host.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a check to add the tasks only when configured.
I don't really have an opinion on finalizedBy or dependsOn


platformLevelTargetsSeen.get(platform).mustRunAfter(jnigenBuildTask);
if (HostDetection.os == os && HostDetection.architecture == architecture && HostDetection.bitness == bitness) {
DefaultTask hostTask = project.getTasks().create("jnigenBuildHost", DefaultTask.class);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package com.badlogic.gdx.jnigen.gradle;

import com.badlogic.gdx.jnigen.BuildConfig;
import com.badlogic.gdx.jnigen.BuildTarget;
import com.badlogic.gdx.jnigen.FileDescriptor;
import com.badlogic.gdx.jnigen.build.RuntimeEnv;
import com.badlogic.gdx.jnigen.build.ToolFinder;
import com.badlogic.gdx.jnigen.build.ToolchainExecutor;
import groovy.lang.Closure;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.TaskAction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.inject.Inject;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public class JnigenSignTask extends DefaultTask {


private static final Logger log = LoggerFactory.getLogger(JnigenSignTask.class);

private final JnigenExtension ext;

private BuildTarget buildTarget;

@Inject
public JnigenSignTask(JnigenExtension ext) {
this.ext = ext;

setGroup("jnigen");
setDescription("Signs native libraries");
}

public void setBuildTarget (BuildTarget buildTarget) {
this.buildTarget = buildTarget;
}

@TaskAction
public void run() {
BuildConfig buildConfig = new BuildConfig(ext.sharedLibName, ext.subProjectDir + ext.temporaryDir, ext.subProjectDir + ext.libsDir, ext.subProjectDir + ext.jniDir, null, new FileDescriptor(ext.subProjectDir));
RuntimeEnv env = new RuntimeEnv();
List<String> args = new ArrayList<>();
switch (buildTarget.os) {
case Windows:
Map<String, String> params = ext.signing.getJsignParams();
params.put("file", buildTarget.getTargetBinaryFile(buildConfig).getPath());
Closure<?> jsign = (Closure<?>) ext.project.getExtensions().getByName("jsign");
jsign.call(params);
break;
case MacOsX:
case IOS:
File codesign = ToolFinder.getToolFile("codesign", env, true);
args.add("-s");
args.add(ext.signing.getIdentity());
args.add("-f");
args.add(buildTarget.getTargetBinaryFile(buildConfig).getPath());
ToolchainExecutor.execute(codesign, new File(""), args, new ToolchainExecutor.ToolchainCallback() {
@Override
public void onInfoMessage(String message) {
log.info(message);
}

@Override
public void onErrorMessage(String message) {
log.error(message);
}

@Override
public void onSuccess() {
log.info("Signing successful");
}

@Override
public void onFail(int statusCode) {
log.error("Signing failed with status code: {}", statusCode);
}
});
break;
case Linux:
case Android:
log.warn("Signing not supported for {}", buildTarget.os);
break;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.badlogic.gdx.jnigen.gradle;

import java.util.Map;

public class JnigenSigningExtension {
private Map<String, String> jsignParams;
private String identity;

public Map<String, String> getJsignParams() {
return jsignParams;
}

public void setJsignParams(Map<String, String> jsignParams) {
this.jsignParams = jsignParams;
}

public String getIdentity() {
return identity;
}

public void setIdentity(String identity) {
this.identity = identity;
}
}
15 changes: 14 additions & 1 deletion gdx-jnigen-generator-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import com.badlogic.gdx.jnigen.commons.Os

plugins {
id "com.badlogicgames.jnigen.jnigen-gradle"
id 'net.jsign' version '6.0'
}

sourceCompatibility = 1.8
Expand Down Expand Up @@ -57,6 +58,18 @@ jnigen {
options = ["-I" + file("src/test/resources/").absolutePath]
}

signing {
jsignParams = [
name : 'My Application',
url : 'http://www.example.com',
keystore : 'keystore.p12',
alias : 'test',
storepass: 'secret',
tsaurl : 'http://timestamp.sectigo.com'
]
identity = '-'
}

addLinux(x32, ARM)
addLinux(x64, x86)
addLinux(x64, ARM)
Expand All @@ -83,4 +96,4 @@ eclipse {
project {
name = "gdx-jnigen-generator-test"
}
}
}
Binary file added gdx-jnigen-generator-test/keystore.p12
Binary file not shown.