aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-02-27 10:57:22 +0100
committerMattias Andrée <maandree@kth.se>2021-02-27 11:02:02 +0100
commitb83198852fb7d91a3af9d826b8a9abc30d1411b9 (patch)
treeb7f3cbf211695d6e819851226216bf7665dfe1f6
parentAdd include path example (diff)
downloadgpp-b83198852fb7d91a3af9d826b8a9abc30d1411b9.tar.gz
gpp-b83198852fb7d91a3af9d826b8a9abc30d1411b9.tar.bz2
gpp-b83198852fb7d91a3af9d826b8a9abc30d1411b9.tar.xz
m
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--Makefile4
-rw-r--r--README6
-rw-r--r--gpp.16
-rwxr-xr-xgpp.py25
4 files changed, 2 insertions, 39 deletions
diff --git a/Makefile b/Makefile
index 96fd134..f841829 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,13 @@ PKGNAME = gpp
COMMAND = gpp
PY = python
-SHEBANG = /usr$(BIN)/env $(PY)
+SHEBANG = /usr/bin/env $(PY)
all: gpp
gpp: gpp.py
- env VERSION='$(VERSION)' SHEBANG='$(SHEBANG)' $(PY) "$<" < "$<" > "$@"
+ env SHEBANG='$(SHEBANG)' $(PY) gpp.py < gpp.py > $@
install: gpp
install -dm755 -- "$(DESTDIR)$(PREFIX)/bin"
diff --git a/README b/README
index b657b56..a703e75 100644
--- a/README
+++ b/README
@@ -73,12 +73,6 @@ OPTIONS
Set the environment variable NAME to hold
the value 1.
- -v, --version
- Print program name and version and exit.
-
- -c, --copying
- Print copyright notice and exit.
-
Short options must be joined. The value of a flag must
be in a separate argument from the flag itself.
diff --git a/gpp.1 b/gpp.1
index 247a0a1..5e32c03 100644
--- a/gpp.1
+++ b/gpp.1
@@ -105,12 +105,6 @@ the value \fIVALUE\fP.
.BR \-D ,\ \-\-export \ \fINAME\fP
Set the environment variable \fINAME\fP to hold
the value 1.
-.TP
-.BR \-v ,\ \-\-version
-Print program name and version and exit.
-.TP
-.BR \-c ,\ \-\-copying
-Print copyright notice and exit.
.PP
Short options must be joined. The value of a flag must
be in a separate argument from the flag itself.
diff --git a/gpp.py b/gpp.py
index 7bdf09d..68a317f 100755
--- a/gpp.py
+++ b/gpp.py
@@ -1,24 +1,5 @@
#!@{SHEBANG}
# -*- coding: utf-8 -*-
-copyright = '''
-gpp – Bash-based general-purpose preprocessor
-
-Copyright © 2013, 2014, 2015, 2017 Mattias Andrée (maandree@member.fsf.org)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-VERSION="@{VERSION}"
import os
import sys
@@ -72,12 +53,6 @@ for i in range(1, len(args)):
export += '=1'
export = (export.split('=')[0], '='.join(export.split('=')[1:]))
os.putenv(export[0], export[1])
- elif arg in ('-v', '--version'):
- print('gpp ' + VERSION)
- sys.exit(0)
- elif arg in ('-c', '--copying'):
- print(copyright[1:-1])
- sys.exit(0)
else:
continue
i += 1