Skip to content

Debian package generation #14

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

Open
KP2048 wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Debian package generation #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0d61edc
created a motor project for motor
KP2048 Dec 1, 2020
df88741
added debian package generation
KP2048 Dec 1, 2020
adc4394
fix wierd git issues
KP2048 Dec 1, 2020
fa1f458
fixed more git funnyness
KP2048 Dec 1, 2020
8ad7d13
changed debuild options
KP2048 Dec 2, 2020
8a2223a
updated version
KP2048 Dec 3, 2020
c6d479f
Delete configure.in
KP2048 Dec 3, 2020
c338b69
Update Makefile
KP2048 Dec 3, 2020
2ab1ebb
Delete NEWS
KP2048 Dec 3, 2020
623f008
Update motor.motor
KP2048 Dec 3, 2020
749cdc1
Update Makefile
KP2048 Dec 3, 2020
08df296
Revert "Update motor.motor"
KP2048 Dec 4, 2020
e7b13b4
Revert "created a motor project for motor"
KP2048 Dec 4, 2020
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
71 changes: 51 additions & 20 deletions share/templates/terminal program/C++/Makefile.func
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Motor IDE functional Makefile template
# for terminal program in C++
# for terminal program in C++

@rofl0r rofl0r Dec 5, 2020

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

your editor seems to automatically convert tabs into spaces. this causes a lot of unnecessary whitespace noise (check rest of the diff)

@KP2048 KP2048 Dec 6, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Vscode does that

@rofl0r rofl0r Dec 6, 2020

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

i don't care who does it, but i care not to merge random whitespace changes :)
it's your task to fix it up (and check whether this behaviour can be disabled in your editor)

#
# Written by Konstantin Klyagin <konst@konst.org.ua>
# Distributed under the GNU Public License
Expand Down Expand Up @@ -150,6 +150,37 @@ distcleanup:[loop 0;{fconnectedlib};1]
mv .makefile.am Makefile.am; \
fi

deb:
@if test ! -d "$(HOME)/.motor/deb"; then \
mkdir "$(HOME)/.motor/deb"; \
fi
@if test ! -d "$(HOME)/.motor/deb/$(PROJNAME)-$(PROJVER)"; then \
mkdir "$(HOME)/.motor/deb/$(PROJNAME)-$(PROJVER)"; \
fi
@if test -d debian; then \
mv debian/ "$(HOME)/.motor/deb/"; \
find . -depth | grep -v ".git" | cpio -pdmv "$(HOME)/.motor/deb/$(PROJNAME)-$(PROJVER)/"; \
pushd "$(HOME)/.motor/deb/$(PROJNAME)-$(PROJVER)"; \
dh_make -sy -c gpl --createorig; \
rm -r debian; \
cp -r ../debian .; \
debuild -sa; \
popd; \
cp -r "$(HOME)/.motor/deb/debian" .; \
else \
find . -depth | grep -v ".git" | cpio -pdmv "$(HOME)/.motor/deb/$(PROJNAME)-$(PROJVER)/"; \
pushd "$(HOME)/.motor/deb/$(PROJNAME)-$(PROJVER)"; \
dh_make -sy -c gpl --createorig; \
rm debian/*.ex debian/*.EX debian/README.Debian debian/README.source; \
echo "$(PROG) usr/bin"> debian/install; \
cp -r debian ..; \
popd; \
cp -r "$(HOME)/.motor/deb/debian" .; \
rm -r "$(HOME)/.motor/deb"; \
echo "now configure the debian directory in `pwd`/debian"; \
read -n 1; \
fi

rpmspec:
@if test ! -f [value name].spec; then \
echo "[value name].spec file not found!"; \
Expand All @@ -166,16 +197,16 @@ rpmspec:

rpm: rpmspec dist
@if test ! -f ~/.motor/rpmrc; then \
echo "macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros:~/.motor/rpmmacros" >~/.motor/rpmrc; \
echo "macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros:~/.motor/rpmmacros" >~/.motor/rpmrc; \
fi
@if test ! -f ~/.motor/rpmmacros; then \
echo "%_topdir $${HOME}/.motor/rpm" >>~/.motor/rpmmacros; \
echo "%_builddir %{_topdir}/BUILD" >>~/.motor/rpmmacros; \
echo "%_rpmdir %{_topdir}/RPMS" >>~/.motor/rpmmacros; \
echo "%_sourcedir %{_topdir}/SOURCES" >>~/.motor/rpmmacros; \
echo "%_specdir %{_topdir}/SPECS" >>~/.motor/rpmmacros; \
echo "%_srcrpmdir %{_topdir}/SRPMS" >>~/.motor/rpmmacros; \
echo "%_tmppath %{_var}/tmp" >>~/.motor/rpmmacros; \
echo "%_topdir $${HOME}/.motor/rpm" >>~/.motor/rpmmacros; \
echo "%_builddir %{_topdir}/BUILD" >>~/.motor/rpmmacros; \
echo "%_rpmdir %{_topdir}/RPMS" >>~/.motor/rpmmacros; \
echo "%_sourcedir %{_topdir}/SOURCES" >>~/.motor/rpmmacros; \
echo "%_specdir %{_topdir}/SPECS" >>~/.motor/rpmmacros; \
echo "%_srcrpmdir %{_topdir}/SRPMS" >>~/.motor/rpmmacros; \
echo "%_tmppath %{_var}/tmp" >>~/.motor/rpmmacros; \
fi
@-for i in SPECS BUILD RPMS SRPMS; do mkdir -p "$${HOME}/.motor/rpm/$$i"; done
unset LINGUAS; rpmbuild -ta --rcfile ~/.motor/rpmrc --target i386-pc-linux-gnu [value packoutdir]/$(DIST_TARGZ)
Expand All @@ -184,16 +215,16 @@ rpm: rpmspec dist

[if {makefmode} = automake]#
# mfdetect(currentfiles) returns
# 1 - root dir 2 - prog dir
# 3 - lib dir 4 - doc dir
# 5 - misc dir
# 1 - root dir 2 - prog dir
# 3 - lib dir 4 - doc dir
# 5 - misc dir
#
# finlist(currentfiles, setof) $result to the list of files matched
#
# variables
# rfnames - files in the current directory (with relative path names)
# fnames - files in the current directory (filenames only)
# dnames - current dir subdirectories
# rfnames - files in the current directory (with relative path names)
# fnames - files in the current directory (filenames only)
# dnames - current dir subdirectories
#
automake: distcleanup
@rootfound=0; \
Expand Down Expand Up @@ -296,7 +327,7 @@ automake: distcleanup
if test ! -z "$$result"; then \
if test ! -z "$$idirs"; then echo "INCLUDES = $$idirs" >>$$amfname; fi; \
if test ! -z "$$cflgs"; then \
echo "CPPFLAGS = $$cflgs" >>$$amfname; \
echo "CPPFLAGS = $$cflgs" >>$$amfname; \
fi; \
lib=`echo $$lib | sed 's/[l]-.,[r]/_/g'`; \
echo "noinst_LIBRARIES = lib$${lib}.a" >>$$amfname; \
Expand Down Expand Up @@ -364,7 +395,7 @@ gettext:
cat configure.in | egrep "^[l][l]:space:[r][r]*AC_OUTPUT" | \
sed "$$acopt" >>configure.in.acout; \
if test ! -z "`egrep '^\s*SUBDIRS' Makefile.am`"; then \
sed 's/^\s*SUBDIRS[l] =[r]*\(.*\)$$/SUBDIRS = intl po \1/g' <Makefile.am >Makefile.am.motmp; \
sed 's/^\s*SUBDIRS[l] =[r]*\(.*\)$$/SUBDIRS = intl po \1/g' <Makefile.am >Makefile.am.motmp; \
else \
echo "SUBDIRS = intl po" >Makefile.am.motmp; cat Makefile.am >>Makefile.am.motmp; \
fi; \
Expand All @@ -376,11 +407,11 @@ gettext:
then mv po/Makevars.template po/Makevars; fi; \
if test -z "$$m4d"; then \
rm -rf m4; \
sed 's/^\s*SUBDIRS[l] =[r]*m4[l] =[r]*\(.*\)$$/SUBDIRS = \1/g' <Makefile.am >Makefile.am.motmp; \
sed 's/^\s*SUBDIRS[l] =[r]*m4[l] =[r]*\(.*\)$$/SUBDIRS = \1/g' <Makefile.am >Makefile.am.motmp; \
grep -v "ACLOCAL_AMFLAGS = -I m4" Makefile.am.motmp >Makefile.am; \
fi; \
if test ! -d intl; then \
sed 's/^\s*SUBDIRS[l] =[r]*intl[l] =[r]*\(.*\)$$/SUBDIRS = \1/g' <Makefile.am >Makefile.am.motmp; \
sed 's/^\s*SUBDIRS[l] =[r]*intl[l] =[r]*\(.*\)$$/SUBDIRS = \1/g' <Makefile.am >Makefile.am.motmp; \
mv Makefile.am.motmp Makefile.am; \
fi; \
fi; \
Expand Down Expand Up @@ -423,5 +454,5 @@ target: ready
gnudoc:
touch INSTALL NEWS README COPYING AUTHORS ChangeLog

.PHONY: build update debug automake dist rpm start makesure distextra \
.PHONY: build update debug automake dist rpm deb start makesure distextra \
distlib gettext target linklibs gnudoc
3 changes: 3 additions & 0 deletions share/templates/terminal program/C++/Settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
%dist tar.gz
target dist

%dist deb
target deb

%dist rpm
target rpm
parameter rpmtarget Target platform
Expand Down
2 changes: 1 addition & 1 deletion src/motorcommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// #define LOCALE_DIR "/usr/local/share/locale/"
// #define SHARE_DIR "/usr/local/share/motor/"
#define VERSION "0.0.0"
#define VERSION "3.5.2"
#define GNUMAKE "gmake"

#endif
Expand Down