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

Create a system menu entry for ConsoleUI #3052

Merged
merged 1 commit into from
May 17, 2020
Merged

Create a system menu entry for ConsoleUI #3052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion debian/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ COPYRIGHTSRC:=copyright
COPYRIGHTDEST:=$(DESTDIR)/usr/share/doc/ckan/copyright
DESKTOPSRC:=ckan.desktop
DESKTOPDEST:=$(DESTDIR)/usr/share/applications/ckan.desktop
CONSOLEUIDESKTOPSRC:=ckan-consoleui.desktop
CONSOLEUIDESKTOPDEST:=$(DESTDIR)/usr/share/applications/ckan-consoleui.desktop
VERSION:=$(shell egrep '^\s*\#\#\s+v.*$$' $(CHANGELOGSRC) | head -1 | sed -e 's/^\s*\#\#\s\+v//' )
DEB:=../_build/deb/ckan_$(VERSION)_all.deb

$(DEB): $(EXEDEST) $(SCRIPTDEST) $(CONTROLDEST) $(CHANGELOGDEST) $(DEBCHANGEDEST) $(MANDEST) $(ICONDEST) $(COPYRIGHTDEST) $(DESKTOPDEST)
$(DEB): $(EXEDEST) $(SCRIPTDEST) $(CONTROLDEST) $(CHANGELOGDEST) $(DEBCHANGEDEST) $(MANDEST) $(ICONDEST) $(COPYRIGHTDEST) $(DESKTOPDEST) $(CONSOLEUIDESKTOPDEST)
umask 0022 && mkdir -p $(shell dirname $@)
fakeroot dpkg-deb --build $(DESTDIR)/ $@

Expand Down Expand Up @@ -65,6 +67,10 @@ $(DESKTOPDEST): $(DESKTOPSRC)
umask 0022 && mkdir -p $(shell dirname $@)
umask 0022 && cp $< $@

$(CONSOLEUIDESKTOPDEST): $(CONSOLEUIDESKTOPSRC)
umask 0022 && mkdir -p $(shell dirname $@)
umask 0022 && cp $< $@

clean:
rm -rf ../_build/deb

Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
ckan (1.28.0) unstable; urgency=low

* Added ConsoleUI desktop file.

-- The CKAN Authors <debian@ksp-ckan.space> Wed, 15 May 2020 19:12:00 +0600

ckan (1.24.0) unstable; urgency=low

* Initial release.
Expand Down
10 changes: 10 additions & 0 deletions debian/ckan-consoleui.desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Name=CKAN Console UI
Comment=Comprehensive Kerbal Archive Network Console UI
Icon=/usr/share/icons/ckan.ico
Categories=Game;Utility
Exec=/usr/bin/ckan consoleui
StartupNotify=true
Terminal=true
Type=Application
Version=1.0
3 changes: 2 additions & 1 deletion rpm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ TOPDIR:=$(shell pwd)/../_build/rpm
SCRIPTSRC:=$(DEBDIR)/ckan
MANSRC:=$(DEBDIR)/ckan.1
DESKTOPSRC:=$(DEBDIR)/ckan.desktop
CONSOLEUIDESKTOPSRC:=$(DEBDIR)/ckan-consoleui.desktop
ICONSRC:=$(DEBDIR)/ckan.ico
EXESRC:=$(shell pwd)/../_build/repack/Release/ckan.exe
CHANGELOGSRC:=../CHANGELOG.md
Expand All @@ -17,7 +18,7 @@ RPM:=$(shell pwd)/../_build/rpm/RPMS/noarch/ckan-$(VERSION)-1.noarch.rpm
# rpmbuild can't handle relative paths for its topdir
# rpmbuild assumes we'll copy files into its SOURCES dir for it

$(RPM): $(SCRIPTSRC) $(EXESRC) $(MANSRC) $(DESKTOPSRC) $(ICONSRC)
$(RPM): $(SCRIPTSRC) $(EXESRC) $(MANSRC) $(DESKTOPSRC) $(ICONSRC) $(CONSOLEUIDESKTOPSRC)
mkdir -p "${TOPDIR}/SOURCES"
cp $^ "${TOPDIR}/SOURCES"
rpmbuild --define "_topdir ${TOPDIR}" --define "_version $(VERSION)" -bb ckan.spec
Expand Down
5 changes: 5 additions & 0 deletions rpm/ckan.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Source1: ckan.exe
Source2: ckan.1
Source3: ckan.desktop
Source4: ckan.ico
Source5: ckan-consoleui.desktop

%description
KSP-CKAN official client.
Expand All @@ -34,6 +35,7 @@ mkdir -p %{buildroot}%{_mandir}/man1
cp %{SOURCE2} %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_datadir}/applications
cp %{SOURCE3} %{buildroot}%{_datadir}/applications
cp %{SOURCE5} %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/icons
cp %{SOURCE4} %{buildroot}%{_datadir}/icons

Expand All @@ -45,5 +47,8 @@ cp %{SOURCE4} %{buildroot}%{_datadir}/icons
%{_mandir}/man1/*

%changelog
* Fri May 15 2020 The CKAN authors <rpm@ksp-ckan.space> 1.28.0
- Added ConsoleUI desktop file

* Thu May 9 2019 The CKAN authors <rpm@ksp-ckan.space> 1.26.3-1
- Initial RPM release