Changeset 363

Timestamp:

May 10, 2012, 11:39:52 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Add resource strings that identify Mozilla plugins.

Location:

trunk/icedtea-web

Files:

• Config.kmk (modified) (1 diff)
• plugin/icedteanp/Makefile.kmk (modified) (3 diffs)
• plugin_os2.rc.in (added)

trunk/icedtea-web/Config.kmk

@@ -8 +8 @@
 
 PACKAGE_NAME       := icedtea-web
-PACKAGE_VERSION    := 1.1.2
+PACKAGE_VER_MAJOR  := 1
+PACKAGE_VER_MINOR  := 1
+PACKAGE_VER_PATCH  := 2
+PACKAGE_VERSION    := $(PACKAGE_VER_MAJOR).$(PACKAGE_VER_MINOR).$(PACKAGE_VER_PATCH)
 PACKAGE_STRING     := $(PACKAGE_NAME) $(PACKAGE_VERSION)
 PACKAGE_URL        := http://icedtea.classpath.org/wiki/IcedTea-Web

trunk/icedtea-web/plugin/icedteanp/Makefile.kmk

@@ -4 +4 @@
 SUB_DEPTH = ../..
 include $(KBUILD_PATH)/subheader.kmk
+
+PLUGIN_NAME     = IcedTea-Web Plugin
+PLUGIN_VERSION  = IcedTea-Web $(FULL_VERSION)
+
+#
+# Plugin DLL
+#
 
 DLLS               += npicedt
@@ -13 +20 @@
                       WITHOUT_GTK
 npicedt_CXXFLAGS    = -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
-                      -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
-                      -DPLUGIN_VERSION="\"IcedTea-Web $(FULL_VERSION)\"" \
+                      -DPLUGIN_NAME="\"$(PLUGIN_NAME)\"" \
+                      -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
                       -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
-                      -DICEDTEA_WEB_JRE_DIR="\"$(SYSTEM_JRE_DIR)\"" \
+                      -DICEDTEA_WEB_JRE_DIR="\"$(ICEDTEA_WEB_JRE_DIR)\"" \
                       -DICEDTEA_WEB_JRE="$(ICEDTEA_WEB_JRE)" \
                       -DICEDTEA_WEB_DATA_DIR="\"$(ICEDTEA_WEB_DATA_DIR)\"" \
@@ -30 +37 @@
     IcedTeaPluginUtils.cc \
     $(PATH_ROOT)/extra/OS.cc
+
+PLUGIN_RC           = $(npicedt_0_OUTDIR)/plugin_os2.rc
+OTHER_CLEAN        += $(PLUGIN_RC)
+npicedt_SOURCES    += $(PLUGIN_RC)
+
+$$(PLUGIN_RC): $(PATH_ROOT)/plugin_os2.rc.in | $$(call DIRDEP,$$(dir $$(@)))
+        sed " \
+        s/@PLUGIN_NAME@/$(PLUGIN_NAME)/g; \
+        s/@PLUGIN_VERSION@/$(PLUGIN_VERSION)/g; \
+        s/@PACKAGE_VER_MAJOR@/$(PACKAGE_VER_MAJOR)/g; \
+        s/@PACKAGE_VER_MINOR@/$(PACKAGE_VER_MINOR)/g; \
+        s/@PACKAGE_VER_PATCH@/$(PACKAGE_VER_PATCH)/g; \
+        s/@PACKAGE_VER_PATCH@/$(PACKAGE_VER_PATCH)/g; \
+        s/@TIMESTAMP@/$(TIMESTAMP)/g; \
+        s/@HOSTNAME@/$(HOSTNAME)/g; \
+        s/@BUILDDATE@/$(shell LANG=C date '+%d %b %Y %T')   /g; \
+        " < $^ > $@
+
+#
+# Plugin JAR
+#
 
 OTHERS += liveconnect