From df3f816f9bacd98c5bd80c007c5f851a5237669a Mon Sep 17 00:00:00 2001 From: MAJigsaw77 <77043862+MAJigsaw77@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:59:39 +0200 Subject: [PATCH] Add `copyrightYears` to `MetaData`. --- src/lime/tools/MetaData.hx | 4 +++- src/lime/tools/ProjectXMLParser.hx | 4 ++-- templates/windows/resource/ApplicationMain.rc | 2 +- tools/platforms/WindowsPlatform.hx | 8 +++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/lime/tools/MetaData.hx b/src/lime/tools/MetaData.hx index 2e859905a..f06a76b20 100644 --- a/src/lime/tools/MetaData.hx +++ b/src/lime/tools/MetaData.hx @@ -10,6 +10,7 @@ abstract MetaData({ @:optional var packageName:String; @:optional var title:String; @:optional var version:String; + @:optional var copyrightYears:String; }) from Dynamic { @:noCompletion @@ -21,6 +22,7 @@ abstract MetaData({ description: "", packageName: "", title: "", - version: "" + version: "", + copyrightYears: "" }; } diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx index 687015c77..eea8c5996 100644 --- a/src/lime/tools/ProjectXMLParser.hx +++ b/src/lime/tools/ProjectXMLParser.hx @@ -683,7 +683,7 @@ class ProjectXMLParser extends HXProject { switch (attribute) { - case "title", "description", "package", "version", "company", "company-id", "build-number", "company-url": + case "title", "description", "package", "version", "company", "company-id", "build-number", "company-url", "copyright-years": var value = substitute(element.att.resolve(attribute)); defines.set("APP_" + StringTools.replace(attribute, "-", "_").toUpperCase(), value); @@ -1738,7 +1738,7 @@ class ProjectXMLParser extends HXProject case "gradle-version": config.set("android.gradle-version", value); - + case "gradle-plugin": config.set("android.gradle-plugin", value); diff --git a/templates/windows/resource/ApplicationMain.rc b/templates/windows/resource/ApplicationMain.rc index 109b2d95c..2d12ca8ef 100644 --- a/templates/windows/resource/ApplicationMain.rc +++ b/templates/windows/resource/ApplicationMain.rc @@ -20,7 +20,7 @@ BEGIN VALUE "FileDescription", "::APP_DESCRIPTION::" VALUE "FileVersion", "::FILE_VERSION::" VALUE "InternalName", "::APP_FILE::" - VALUE "LegalCopyright", "Copyright (C) ::COPYRIGHT_YEARS:: ::APP_COMPANY::" + VALUE "LegalCopyright", "Copyright (C) ::APP_COPYRIGHT_YEARS:: ::APP_COMPANY::" VALUE "OriginalFilename", "::APP_FILE::" VALUE "ProductName", "::APP_PACKAGE::" VALUE "ProductVersion", "::FILE_VERSION::" diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx index c9227243e..46c8f6ec1 100644 --- a/tools/platforms/WindowsPlatform.hx +++ b/tools/platforms/WindowsPlatform.hx @@ -686,6 +686,11 @@ class WindowsPlatform extends PlatformTarget context.APP_DESCRIPTION = project.meta.title; } + if (context.APP_COPYRIGHT_YEARS == null || context.APP_COPYRIGHT_YEARS == "") + { + context.APP_COPYRIGHT_YEARS = Std.string(Date.now().getFullYear()); + } + var versionParts = project.meta.version.split("."); if (versionParts.length == 3) @@ -695,9 +700,6 @@ class WindowsPlatform extends PlatformTarget context.FILE_VERSION = versionParts.join("."); context.VERSION_NUMBER = versionParts.join(","); - - // TODO: Implement this properly. - context.COPYRIGHT_YEARS = Std.string(Date.now().getFullYear()); } context.NEKO_FILE = targetDirectory + "/obj/ApplicationMain.n";