Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INFO and config alignment spksrc.service.mk #4993

Merged
merged 2 commits into from
Dec 8, 2021
Merged

INFO and config alignment spksrc.service.mk #4993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a02be0
Update spksrc.service.mk
BKSteve Dec 6, 2021
154bc7a
keep com.synocommunity.packages in app name
hgy59 Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mk/spksrc.service.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# folder at intallation and runtime.
# SSS_SCRIPT (optional) custom script file for service start/stop/status when the generic
# installer generated script (SERVICE_SETUP) is not usable.
# NO_SERVICE_SHORTCUT (optional) do not create
# NO_SERVICE_SHORTCUT (optional) do not create an app icon in the DSM desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just an update of the comment and has to be validated for correct implementation.

# INSTALLER_SCRIPT (deprecated) installer script file before introduction of generic installer
#

Expand Down
14 changes: 9 additions & 5 deletions mk/spksrc.spk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,16 @@ ifneq ($(strip $(DSM_UI_DIR)),)
endif
ifneq ($(strip $(DSM_APP_NAME)),)
@echo dsmappname=\"$(DSM_APP_NAME)\" >> $@
@echo dsmapppage=\"$(DSM_APP_NAME)\" >> $@
@echo dsmapplaunchname=\"$(DSM_APP_NAME)\" >> $@
else
@echo dsmappname=\"com.synocommunity.$(SPK_NAME)\" >> $@
@echo dsmapppage=\"com.synocommunity.$(SPK_NAME)\" >> $@
@echo dsmapplaunchname=\"com.synocommunity.$(SPK_NAME)\" >> $@
@echo dsmappname=\"com.synocommunity.packages.$(SPK_NAME)\" >> $@
endif
ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
ifneq ($(strip $(DSM_APP_PAGE)),)
@echo dsmapppage=\"$(DSM_APP_PAGE)\" >> $@
endif
ifneq ($(strip $(DSM_APP_LAUNCH_NAME)),)
@echo dsmapplaunchname=\"$(DSM_APP_LAUNCH_NAME)\" >> $@
endif
endif
ifneq ($(strip $(ADMIN_PROTOCOL)),)
@echo adminprotocol=\"$(ADMIN_PROTOCOL)\" >> $@
Expand Down