Skip to content
Permalink
Browse files
8264144: Add handling of "--about-url" CLI parameter for RPM/DEB pack…
…ages

Reviewed-by: herrick, almatvee
  • Loading branch information
Alexey Semenyuk committed Jun 8, 2021
1 parent ae16052 commit bcaa2cb154ae5d23a067f6e38a19a21eef8fe8e8
@@ -40,12 +40,14 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
@@ -437,6 +439,9 @@ private void prepareProjectConfig(Map<String, String> data,
data.put("APPLICATION_ARCH", DEB_ARCH);
data.put("APPLICATION_INSTALLED_SIZE", Long.toString(
createMetaPackage(params).sourceApplicationLayout().sizeInBytes() >> 10));
data.put("APPLICATION_HOMEPAGE", Optional.ofNullable(
ABOUT_URL.fetchFrom(params)).map(value -> "Homepage: " + value).orElse(
""));

return data;
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -44,6 +45,7 @@
import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
import static jdk.jpackage.internal.OverridableResource.createResource;
import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;

/**
* There are two command line options to configure license information for RPM
@@ -187,6 +189,9 @@ protected Path buildPackageBundle(
data.put("APPLICATION_LICENSE_FILE", licenseFile);
data.put("APPLICATION_GROUP", GROUP.fetchFrom(params));

data.put("APPLICATION_URL", Optional.ofNullable(ABOUT_URL.fetchFrom(
params)).orElse(""));

return data;
}

@@ -8,3 +8,4 @@ Provides: APPLICATION_PACKAGE
Description: APPLICATION_DESCRIPTION
Depends: PACKAGE_DEFAULT_DEPENDENCIES PACKAGE_CUSTOM_DEPENDENCIES
Installed-Size: APPLICATION_INSTALLED_SIZE
APPLICATION_HOMEPAGE
@@ -5,6 +5,10 @@ Release: APPLICATION_RELEASE
License: APPLICATION_LICENSE_TYPE
Vendor: APPLICATION_VENDOR

%if "xAPPLICATION_URL" != "x"
URL: APPLICATION_URL
%endif

%if "xAPPLICATION_PREFIX" != "x"
Prefix: APPLICATION_PREFIX
%endif
@@ -0,0 +1,99 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import jdk.jpackage.test.Annotations.Test;
import jdk.jpackage.test.Functional.ThrowingConsumer;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.PackageType;


/**
* Test --about-url parameter in Linux installers. Output of the test should be
* appabouturltest_1.0-1_amd64.deb or appabouturltest-1.0-1.amd64.rpm package
* bundle. The output package should provide the same functionality as the
* default package.
*
* deb:
* Homepage property of the package should be set to http://foo.com value.
*
* rpm:
* URL property of the package should be set to http://foo.com value.
*/

/*
* @test
* @summary jpackage with --about-url
* @library ../helpers
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @build AppAboutUrlTest
* @requires (os.family == "linux")
* @requires (jpackage.test.SQETest == null)
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=AppAboutUrlTest
*/

/*
* @test
* @summary jpackage with --about-url
* @library ../helpers
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @build AppAboutUrlTest
* @requires (os.family == "linux")
* @requires (jpackage.test.SQETest != null)
* @modules jdk.jpackage/jdk.jpackage.internal
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=AppAboutUrlTest.test
*/
public class AppAboutUrlTest {

@Test
public static void test() {
final String ABOUT_URL = "http://foo.com";

runTest(cmd -> {
cmd.addArguments("--about-url", ABOUT_URL);
}, ABOUT_URL, ABOUT_URL);
}

@Test
public static void testDefaults() {
runTest(JPackageCommand::setFakeRuntime, "", "(none)");
}

private static void runTest(ThrowingConsumer<JPackageCommand> initializer,
String expectedDebHomepage, String expectedRpmUrl) {
new PackageTest()
.forTypes(PackageType.LINUX)
.configureHelloApp()
.addInitializer(initializer)
.forTypes(PackageType.LINUX_DEB)
.addBundlePropertyVerifier("Homepage", expectedDebHomepage)
.forTypes(PackageType.LINUX_RPM)
.addBundlePropertyVerifier("URL", expectedRpmUrl)
.run();
}
}

1 comment on commit bcaa2cb

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on bcaa2cb Jun 8, 2021

Please sign in to comment.