Skip to content

Commit 64dcd50

Browse files
committed
Remove dependency on yodl tools and remove ccache-swig man page
Use the CCache.html docs instead of the ccache-swig man page. The yodl2man and yodl2html tools are no longer used and so SWIG no longer has a dependency on these packages which were required when building from git. Closes swig#286 Closes swig#128
1 parent 9acf189 commit 64dcd50

File tree

10 files changed

+491
-32
lines changed

10 files changed

+491
-32
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ swig.spec
8585
# Build Artifacts
8686
.dirstamp
8787
CCache/ccache-swig
88-
CCache/ccache-swig.1
89-
CCache/web/ccache-man.html
9088
Lib/swigwarn.swg
9189
Source/CParse/parser.c
9290
Source/CParse/parser.h
@@ -96,7 +94,6 @@ swig
9694
Tools/javascript/javascript
9795

9896
# Generated documentation
99-
Doc/Manual/CCache.html
10097
Doc/Manual/SWIGDocumentation.html
10198
Doc/Manual/SWIGDocumentation.pdf
10299
Doc/Manual/*.book

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ script:
201201
- if test -z "$SWIGLANG"; then make -s $SWIGJOBS check-ccache; fi
202202
- if test -z "$SWIGLANG"; then make -s $SWIGJOBS check-errors-test-suite; fi
203203
- echo 'Installing...' && echo -en 'travis_fold:start:script.2\\r'
204-
# make install doesn't work on os x due to missing yodl2man
205-
- if test -z "$SWIGLANG" -a "$TRAVIS_OS_NAME" = "linux"; then sudo make -s install && swig -version && ccache-swig -V; fi
204+
- if test -z "$SWIGLANG"; then sudo make -s install && swig -version && ccache-swig -V; fi
206205
- echo -en 'travis_fold:end:script.2\\r'
207206
# Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
208207
- if test -n "$SWIGLANG"; then cflags=$($TRAVIS_BUILD_DIR/Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD --compiler=$CC) && echo $cflags; fi

CCache/Makefile.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,21 @@ $(srcdir)/$(PACKAGE_NAME).1: $(srcdir)/ccache.yo
4343
$(srcdir)/web/ccache-man.html: $(srcdir)/ccache.yo
4444
yodl2html -o $(srcdir)/web/ccache-man.html $(srcdir)/ccache.yo
4545

46-
install: $(PACKAGE_NAME)$(EXEEXT) $(srcdir)/$(PACKAGE_NAME).1
46+
install: $(PACKAGE_NAME)$(EXEEXT)
4747
@echo "Installing $(PACKAGE_NAME)"
4848
@echo "Installing $(DESTDIR)${bindir}/`echo $(PACKAGE_NAME) | sed '$(transform)'`$(EXEEXT)"
4949
${INSTALLCMD} -d $(DESTDIR)${bindir}
5050
${INSTALLCMD} -m 755 $(PACKAGE_NAME)$(EXEEXT) $(DESTDIR)${bindir}/`echo $(PACKAGE_NAME) | sed '$(transform)'`$(EXEEXT)
51+
52+
install-docs: $(srcdir)/$(PACKAGE_NAME).1
5153
@echo "Installing $(DESTDIR)${mandir}/man1/`echo $(PACKAGE_NAME) | sed '$(transform)'`.1"
5254
${INSTALLCMD} -d $(DESTDIR)${mandir}/man1
5355
${INSTALLCMD} -m 644 $(srcdir)/$(PACKAGE_NAME).1 $(DESTDIR)${mandir}/man1/`echo $(PACKAGE_NAME) | sed '$(transform)'`.1
5456

55-
uninstall: $(PACKAGE_NAME)$(EXEEXT) $(srcdir)/$(PACKAGE_NAME).1
57+
uninstall: $(PACKAGE_NAME)$(EXEEXT)
5658
rm -f $(DESTDIR)${bindir}/`echo $(PACKAGE_NAME) | sed '$(transform)'`$(EXEEXT)
59+
60+
uninstall-docs: $(srcdir)/$(PACKAGE_NAME).1
5761
rm -f $(DESTDIR)${mandir}/man1/`echo $(PACKAGE_NAME) | sed '$(transform)'`.1
5862

5963
clean:

CHANGES.current

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ See the RELEASENOTES file for a summary of changes in each release.
55
Version 3.0.8 (in progress)
66
===========================
77

8+
2015-12-17: wsfulton
9+
Issues #286, #128
10+
Remove ccache-swig.1 man page - please use the CCache.html docs instead.
11+
The yodl2man and yodl2html tools are no longer used and so SWIG no
12+
longer has a dependency on these packages which were required when
13+
building from git.
14+
815
2015-12-16: zturner/coleb
916
[Python] Fix Python3.5 interpreter assertions when objects are being
1017
deleted due to an existing exception. Most notably in generators

0 commit comments

Comments
 (0)