coren has submitted this change and it was merged. Change subject: Use autotools as build system ......................................................................
Use autotools as build system Change-Id: I87079303477ebbc15404f4ab2ce04377032e2632 --- A .gitignore A Makefile.am A configure.ac M debian/.gitignore M debian/control M debian/jobutils.install D debian/jobutils.links M debian/jobutils.manpages M debian/misctools.install M debian/rules A jobutils/.gitignore A jobutils/Makefile.am A jobutils/bin/.gitignore A jobutils/bin/Makefile.am A jobutils/man/.gitignore A jobutils/man/Makefile.am A misctools/.gitignore A misctools/Makefile.am 18 files changed, 57 insertions(+), 9 deletions(-) Approvals: coren: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..97cb339 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache +/build-aux +/config.log +/config.status +/configure diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..774dde8 --- /dev/null +++ b/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = jobutils misctools diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..3adb2c6 --- /dev/null +++ b/configure.ac @@ -0,0 +1,14 @@ +AC_INIT([toollabs], [1.0.4dev], [[email protected]]) +AC_CONFIG_AUX_DIR([build-aux]) + +AM_INIT_AUTOMAKE([foreign no-dist silent-rules -Wall -Werror]) +AC_PROG_INSTALL +AC_PROG_LN_S + +AC_CONFIG_FILES([Makefile + jobutils/Makefile + jobutils/bin/Makefile + jobutils/man/Makefile + misctools/Makefile]) + +AC_OUTPUT diff --git a/debian/.gitignore b/debian/.gitignore index 6fec785..57c129f 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,3 +1,5 @@ +/autoreconf.after +/autoreconf.before /files /jobutils /jobutils.debhelper.log @@ -5,3 +7,4 @@ /misctools /misctools.debhelper.log /misctools.substvars +/tmp diff --git a/debian/control b/debian/control index 3352e96..964e4af 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Uploaders: Marc-André Pelletier <[email protected]>, Carl Fürstenberg <[email protected]>, Petr Bena <[email protected]> -Build-Depends: debhelper (>= 8.0.0) +Build-Depends: debhelper (>= 8.0.0), dh-autoreconf Standards-Version: 3.9.3 Vcs-Git: https://gerrit.wikimedia.org/r/labs/toollabs Vcs-Browser: https://git.wikimedia.org/summary/labs%2Ftoollabs diff --git a/debian/jobutils.install b/debian/jobutils.install index a3b0f4a..3b8bf2f 100644 --- a/debian/jobutils.install +++ b/debian/jobutils.install @@ -1 +1,5 @@ -jobutils/bin/* /usr/bin +usr/bin/job +usr/bin/jstart +usr/bin/jstop +usr/bin/jsub +usr/bin/qcronsub diff --git a/debian/jobutils.links b/debian/jobutils.links deleted file mode 100644 index e4214dd..0000000 --- a/debian/jobutils.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/jsub /usr/bin/jstart -/usr/bin/jsub /usr/bin/qcronsub diff --git a/debian/jobutils.manpages b/debian/jobutils.manpages index 360d854..bde9a92 100644 --- a/debian/jobutils.manpages +++ b/debian/jobutils.manpages @@ -1 +1,3 @@ -jobutils/man/* +debian/tmp/usr/share/man/man1/jstart.1 +debian/tmp/usr/share/man/man1/jstop.1 +debian/tmp/usr/share/man/man1/jsub.1 diff --git a/debian/misctools.install b/debian/misctools.install index 7116393..20e481b 100644 --- a/debian/misctools.install +++ b/debian/misctools.install @@ -1,3 +1,3 @@ -misctools/become /usr/bin -misctools/toolwatcher /usr/sbin -misctools/rmtool /usr/sbin +usr/bin/become +usr/sbin/rmtool +usr/sbin/toolwatcher diff --git a/debian/rules b/debian/rules index c916ab4..cc628e0 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ %: - dh $@ + dh $@ --with autoreconf # Test that Perl scripts not have compilation errors. override_dh_auto_test: diff --git a/jobutils/.gitignore b/jobutils/.gitignore new file mode 100644 index 0000000..b336cc7 --- /dev/null +++ b/jobutils/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/jobutils/Makefile.am b/jobutils/Makefile.am new file mode 100644 index 0000000..f3ac5b3 --- /dev/null +++ b/jobutils/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = bin man diff --git a/jobutils/bin/.gitignore b/jobutils/bin/.gitignore new file mode 100644 index 0000000..b336cc7 --- /dev/null +++ b/jobutils/bin/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/jobutils/bin/Makefile.am b/jobutils/bin/Makefile.am new file mode 100644 index 0000000..764fc98 --- /dev/null +++ b/jobutils/bin/Makefile.am @@ -0,0 +1,6 @@ +bin_SCRIPTS = job jstop jsub + +install-exec-hook: + cd $(DESTDIR)$(bindir) && \ + $(LN_S) jsub jstart && \ + $(LN_S) jsub qcronsub diff --git a/jobutils/man/.gitignore b/jobutils/man/.gitignore new file mode 100644 index 0000000..b336cc7 --- /dev/null +++ b/jobutils/man/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/jobutils/man/Makefile.am b/jobutils/man/Makefile.am new file mode 100644 index 0000000..c9b180d --- /dev/null +++ b/jobutils/man/Makefile.am @@ -0,0 +1 @@ +man_MANS = jstart.1 jstop.1 jsub.1 diff --git a/misctools/.gitignore b/misctools/.gitignore new file mode 100644 index 0000000..b336cc7 --- /dev/null +++ b/misctools/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/misctools/Makefile.am b/misctools/Makefile.am new file mode 100644 index 0000000..62e39ae --- /dev/null +++ b/misctools/Makefile.am @@ -0,0 +1,2 @@ +bin_SCRIPTS = become +sbin_SCRIPTS = rmtool toolwatcher -- To view, visit https://gerrit.wikimedia.org/r/70771 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I87079303477ebbc15404f4ab2ce04377032e2632 Gerrit-PatchSet: 3 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt <[email protected]> Gerrit-Reviewer: AzaToth <[email protected]> Gerrit-Reviewer: Petrb <[email protected]> Gerrit-Reviewer: Tim Landscheidt <[email protected]> Gerrit-Reviewer: coren <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
