Changeset 1271 for spec/trunk/SPECS

Timestamp:

Dec 14, 2017, 4:33:21 PM (8 years ago)

Author:

Silvan Scherrer

Message:

spec: bww-resources-rpm: Release version 1.1.1-1.

Location:

spec/trunk/SPECS

Files:

• bww-resources-rpm.spec (modified) (2 diffs)
• bww-resources-rpm/bww-fix-docdir.cmd (modified) (1 diff)
• bww-resources-rpm/macros.bww (modified) (3 diffs)

spec/trunk/SPECS/bww-resources-rpm.spec

@@ -4 +4 @@
 Summary:       bitwise works icons and folders
 Name:          bww-resources-rpm
-Version:       1.1.0
-Release:       3%{?dist}
+Version:       1.1.1
+Release:       1%{?dist}
 License:       Proprietory
 Group:         Applications/System
@@ -96 +96 @@
 
 %changelog
+* Thu Dec 14 2017 Silvan Scherrer <silvan.scherrer@aroa.ch> 1.1.1-1
+- added bww_app_shadow and removed the -s switch from bww_app
+
 * Wed Oct 04 2017 Silvan Scherrer <silvan.scherrer@aroa.ch> 1.1.0-3
 - changed bww_doc to bww_docdir

spec/trunk/SPECS/bww-resources-rpm/bww-fix-docdir.cmd

@@ -8 +8 @@
 LenLN    = d2x(length(Longname))
 if debug then say prg': "'Docfldr'"'
-ok = SysSetObjectData(DocFldr, "ALWAYSSORT=YES;DEFAULTSORT=-1;SHOWALLINTREEVIEW=YES;DEFAULTVIEW=TREE;NODELETE=YES;")
+ok = SysSetObjectData(DocFldr, "OBJECTID=<RPMYUM_DOCFLDR>;ALWAYSSORT=YES;DEFAULTSORT=-1;SHOWALLINTREEVIEW=YES;DEFAULTVIEW=TREE;NODELETE=YES;")
 if ok = 1 & debug then say prg": Adjusted view successfully."
 ok = SysPutEA(DocFldr,'.LONGNAME', x2c("FDFF")||x2c(LenLN||"00")||LongName)

spec/trunk/SPECS/bww-resources-rpm/macros.bww

@@ -48 +48 @@
 # bww_app creates:
 #  a object in the bww folder (will get a BWW_%{name}_<ID>_APP WPS object ID)
-#  a shadow of the object on the desktop (if requested) (will get a BWW_%{name}_<ID>_APP_SHADOW WPS object ID)
-#
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# !!!!!! be aware that the -s option (if used) is not the last option. !!!!!!
-# !!!!!! as else the complete object is not generated.                 !!!!!!
-# !!!!!! this looks like a rpm issue                                   !!!!!!
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #
 # %bww_app [ID] -f APP -t TITLE [-n PACKAGE] [-s] [-a ASSOCIATIONS] [-i ICON] [-d STARTUPDIR]
@@ -68 +61 @@
 #     installation!
 #  -d STARTUPDIR (when provided: this value is set as STARTUPDIR in the wps object)
-#  -s (when provided: create a shadow on the desktop)
 #
 
-%bww_app(f:t:n:a:i:d:s)\
+%bww_app(f:t:n:a:i:d:)\
 %{!-f:%{error:%0: Missing mandatory EXEFILE parameter}}\
 %{!-t:%{error:%0: Missing mandatory TITLE parameter}}\
@@ -82 +74 @@
 %global __bww_app_name %{-f*}\
 %wps_object_create %{__bww_app_id}:WPProgram|%{__bww_app_title}|<%{__bww_folder_id}>|EXENAME=((%{__bww_app_name}));%{__bww_app_startupdir}TITLE=%{__bww_app_title};%{__bww_app_icon}%{__bww_app_assoc}\
-%{-s:%wps_object_create %{__bww_app_id}_SHADOW:WPShadow|%{__bww_app_title}|<WP_DESKTOP>|SHADOWID=<%{__bww_app_id}>;}\
+%{nil}
+
+# bww_app_shadow creates:
+#  a shadow of the object on the given WPS destination (will get a BWW_%{name}_<ID>_APP_SHADOW WPS object ID)
+#
+#
+# %bww_app_shadow [ID] -t TITLE [-n PACKAGE] [-d WPSID]
+#  ID (when provided: this ID is added to the WPS id)
+#  -t TITLE (Mandatory: use TITLE as the app title)
+#     (TITLE *must* be a %global macro if with spaces)
+#  -n PACKAGE (when provided: associate the folder with PACKAGE, else with %{name})
+#  -d WPSID (when provided: use this ID as the parent, else use WP_DESKTOP)
+#
+
+%bww_app_shadow(t:n:d:)\
+%{!-t:%{error:%0: Missing mandatory TITLE parameter}}\
+%bww_create_folder_id\
+%bww_create_app_id\
+%global __bww_app_title %{-t*}\
+%global __bww_app_shadowdest %{!-d:WP_DESKTOP}%{-d:%{-d*}}\
+%wps_object_create %{__bww_app_id}_%{__bww_app_shadowdest}_SHADOW:WPShadow|%{__bww_app_title}|<%{__bww_app_shadowdest}>|SHADOWID=<%{__bww_app_id}>;\
 %{nil}