Skip to content
Browse files

FIREBREATH-164: Finish changing FBSTRING_FileDescription to .._Plugin…

…Description
  • Loading branch information...
1 parent cb17839 commit 0a335c50ddfcc95c2e5691f1d89190440afb8ede @taxilian taxilian committed
View
2 cmake/CommonPluginConfig.cmake
@@ -99,7 +99,7 @@ endif()
# fallback to define FBSTRING_PluginDescription for templates if the
# user hasn't done this in PluginConfig.cmake
-if (NOT DEFINED FBSTRING_PluginDescription)
+if (NOT FBSTRING_PluginDescription)
set(FBSTRING_PluginDescription ${FBSTRING_FileDescription})
endif()
View
2 examples/BasicMediaPlayer/Mac/bundle_template/Info.plist
@@ -47,7 +47,7 @@
<key>${FBSTRING_MIMEType}</key>
<dict>
<key>WebPluginTypeDescription</key>
- <string>${FBSTRING_FileDescription}</string>
+ <string>${FBSTRING_PluginDescription}</string>
</dict>
</dict>
</dict>
View
3 examples/BasicMediaPlayer/PluginConfig.cmake
@@ -45,7 +45,6 @@ set(FBSTRING_PLUGIN_VERSION "1.0.0")
set(FBSTRING_LegalCopyright "Copyright 2009 Firebreath development team")
set(FBSTRING_PluginFileName "npBasicMediaPlayer.dll")
set(FBSTRING_ProductName "FireBreath BasicMediaPlayer Plugin")
-set(FBSTRING_FileDescription "")
set(FBSTRING_FileExtents "")
set(FBSTRING_PluginName "FireBreath BasicMediaPlayer Plugin")
set(FBSTRING_MIMEType "application/x-vnd.FBBasicMediaPlayer")
@@ -60,4 +59,4 @@ set (FBMAC_USE_INVALIDATINGCOREANIMATION 1)
#set (FBWIN_WINDOWLESS 0)
-add_firebreath_library(log4cplus)
+add_firebreath_library(log4cplus)
View
2 examples/FBTestPlugin/MULTIMIME_NOTES.txt
@@ -4,7 +4,7 @@ in a single codebase:
1. Edit PluginConfig.cmake, add multiple entries for the following
entries: FBSTRING_MIMEType, ACTIVEX_PROGID, FBControl_GUID, and
- FBSTRING_FileDescription. Make sure that you provide unique values for
+ FBSTRING_PluginDescription. Make sure that you provide unique values for
all entries, including the GUIDs in FBControl_GUID.
2. Edit Factory.cpp, modify PluginFactory::createPlugin() and add code
View
2 examples/FBTestPlugin/Mac/bundle_template/Info.plist
@@ -44,7 +44,7 @@
<string>${FBSTRING_ProductName}</string>
<key>WebPluginMIMETypes</key>
<dict>
-@@foreach (FBSTRING_MIMEType CUR_MIMETYPE FBSTRING_FileDescription CUR_DESC)
+@@foreach (FBSTRING_MIMEType CUR_MIMETYPE FBSTRING_PluginDescription CUR_DESC)
<key>${CUR_MIMETYPE}</key>
<dict>
<key>WebPluginExtensions</key>
View
2 examples/FBTestPlugin/PluginConfig.cmake
@@ -53,7 +53,7 @@ set(FBControl_GUID
9E506282-69D3-5ABA-9C1D-15994B37F4AE
)
set(FBSTRING_FileExtents "")
-set(FBSTRING_FileDescription
+set(FBSTRING_PluginDescription
"Firebreath Test Plugin - Plugin for testing all interfaces and features"
"Firebreath Test Plugin Math - Helper created from Main Plugin Object"
"Firebreath Test Plugin SimpleMath - Helper created from Second Plugin Object"
View
2 fbgen/src/Mac/bundle_template/Info.plist
@@ -44,7 +44,7 @@
<string>${FBSTRING_PluginDescription}</string>
<key>WebPluginMIMETypes</key>
<dict>
-@@foreach (FBSTRING_MIMEType CUR_MIMETYPE FBSTRING_FileExtents CUR_EXTENT FBSTRING_FileDescription CUR_DESC)
+@@foreach (FBSTRING_MIMEType CUR_MIMETYPE FBSTRING_FileExtents CUR_EXTENT FBSTRING_PluginDescription CUR_DESC)
<key>${CUR_MIMETYPE}</key>
<dict>
<key>WebPluginExtensions</key>
View
1 fbgen/src/PluginConfig.cmake
@@ -39,7 +39,6 @@ set(FBSTRING_LegalCopyright "Copyright @{YEAR} @{COMPANY_name}")
set(FBSTRING_PluginFileName "np${PLUGIN_NAME}.dll")
set(FBSTRING_ProductName "@{PLUGIN_name}")
set(FBSTRING_FileExtents "")
-set(FBSTRING_FileDescription "")
set(FBSTRING_PluginName "@{PLUGIN_name}")
set(FBSTRING_MIMEType "@{PLUGIN_mimetype}")
View
6 gen_templates/FBControl.rgs
@@ -1,5 +1,5 @@
HKCR {
-@@foreach (ACTIVEX_PROGID PROGID FBControl_GUID CUR_GUID FBSTRING_FileDescription CUR_DESC)
+@@foreach (ACTIVEX_PROGID PROGID FBControl_GUID CUR_GUID FBSTRING_PluginDescription CUR_DESC)
${PROGID}.${AXVERSION_NUM} = s '${CUR_DESC}' {
CLSID = s '{${CUR_GUID}}'
}
@@ -9,7 +9,7 @@ HKCR {
}
@@endforeach
NoRemove CLSID {
-@@foreach (ACTIVEX_PROGID PROGID FBControl_GUID CUR_GUID FBSTRING_FileDescription CUR_DESC)
+@@foreach (ACTIVEX_PROGID PROGID FBControl_GUID CUR_GUID FBSTRING_PluginDescription CUR_DESC)
ForceRemove {${CUR_GUID}} = s '${CUR_DESC}' {
ProgID = s '${PROGID}.${AXVERSION_NUM}'
VersionIndependentProgID = s '${PROGID}'
@@ -30,7 +30,7 @@ HKCR {
NoRemove MIME {
NoRemove Database {
NoRemove 'Content Type' {
-@@foreach (FBControl_GUID CUR_GUID FBSTRING_MIMEType CUR_MIMETYPE FBSTRING_FileExtents CUR_EXTENTS FBSTRING_FileDescription CUR_DESC)
+@@foreach (FBControl_GUID CUR_GUID FBSTRING_MIMEType CUR_MIMETYPE FBSTRING_FileExtents CUR_EXTENTS FBSTRING_PluginDescription CUR_DESC)
'${CUR_MIMETYPE}' = s '${CUR_DESC}' {
val Extension = s '${CUR_EXTENTS}'
val CLSID = s '{${CUR_GUID}}'
View
6 gen_templates/config.h
@@ -23,17 +23,19 @@
#define FBSTRING_MIMETypeList "${FBMIMETYPE_LIST}"
-@@foreach (FBSTRING_MIMEType CURMIME FBSTRING_FileExtents CUREXTENT FBSTRING_FileDescription CURDESC)
+@@foreach (FBSTRING_MIMEType CURMIME FBSTRING_FileExtents CUREXTENT FBSTRING_PluginDescription CURDESC)
#define FBSTRING_MIMEType${i} "${CURMIME}"
#define FBSTRING_X11MIMEType${i} "${CURMIME}:${CUREXTENT}:${CURDESC}"
+#define FBSTRING_PluginDescription${i} "${CURDESC}"
#define FBSTRING_FileDescription${i} "${CURDESC}"
#define FBSTRING_FileExtents${i} "${CUREXTENT}"
@@endforeach
#define FBSTRING_PluginDescription "${FBSTRING_PluginDescription}"
+#define FBSTRING_FileDescription "${FBSTRING_PluginDescription}"
#define FBSTRING_FileExtents FBSTRING_FileExtents0
#define FBSTRING_X11MIMEType \
-@@foreach (FBSTRING_MIMEType CURMIME FBSTRING_FileExtents CUREXTENT FBSTRING_FileDescription CURDESC)
+@@foreach (FBSTRING_MIMEType CURMIME FBSTRING_FileExtents CUREXTENT FBSTRING_PluginDescription CURDESC)
"${CURMIME}:${CUREXTENT}:${CURDESC};" \
@@endforeach
""
View
1 tests/mock/global/config.h
@@ -19,6 +19,7 @@
#define FBSTRING_MIMEType0 "application/x-nothing"
#define FBSTRING_X11MIMEType0 "application/x-nothing::Some plugin test"
#define FBSTRING_FileDescription0 "Some plugin test"
+#define FBSTRING_PluginDescription0 "Some plugin test"
#define FBSTRING_FileExtents0 ""
#define FBSTRING_PluginDescription FBSTRING_FileDescription0
#define FBSTRING_FileDescription FBSTRING_FileDescription0

0 comments on commit 0a335c5

Please sign in to comment.
Something went wrong with that request. Please try again.