Commit e77d88fadfb48d1d15f5ea82937162af67e51589
1 parent
1c2f5a5a
Copy cscripts into bin directory instead of creating a symbolic links (#1987)
Showing
3 changed files
with
11 additions
and
6 deletions
ChangeLog
| 1 | -2017-04-04 | 1 | +2017-04-05 |
| 2 | 2 | ||
| 3 | * Version 1.3.0 released | 3 | * Version 1.3.0 released |
| 4 | ======================== | 4 | ======================== |
| 5 | 5 | ||
| 6 | + Copy cscripts into bin directory instead of creating a symbolic links (#1987) | ||
| 6 | If code originates from Git, always compile the Python bindings (#1985) | 7 | If code originates from Git, always compile the Python bindings (#1985) |
| 7 | Raise exception instead of exiting with return code in Python tests (#1983) | 8 | Raise exception instead of exiting with return code in Python tests (#1983) |
| 8 | Support of map cubes lying outside RoI in ctobssim | 9 | Support of map cubes lying outside RoI in ctobssim |
NEWS
| 1 | New Features and Important Changes in ctools 1.3.0.dev1 | 1 | New Features and Important Changes in ctools 1.3.0.dev1 |
| 2 | 2 | ||
| 3 | -4 April 2017 | 3 | +5 April 2017 |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | Introduction | 6 | Introduction |
| @@ -21,6 +21,10 @@ This solves the problem that occured for developers that could not get rid | @@ -21,6 +21,10 @@ This solves the problem that occured for developers that could not get rid | ||
| 21 | of existing Python wrappers, even if they modified the Python interface | 21 | of existing Python wrappers, even if they modified the Python interface |
| 22 | (#1985). | 22 | (#1985). |
| 23 | 23 | ||
| 24 | +The cscripts are now copied into the bin directory upon installation instead | ||
| 25 | +of creating symbolic links. This avoids problems on some VM file systems on | ||
| 26 | +which creation of symbolic links does not work (#1987). | ||
| 27 | + | ||
| 24 | 28 | ||
| 25 | Python interface | 29 | Python interface |
| 26 | ---------------- | 30 | ---------------- |
cscripts/Makefile.am
| @@ -223,7 +223,7 @@ EXTRA_DIST = $(binscripts) $(pythonscripts) $(parfiles) \ | @@ -223,7 +223,7 @@ EXTRA_DIST = $(binscripts) $(pythonscripts) $(parfiles) \ | ||
| 223 | $(testscripts) $(testdata) $(testiactdata) \ | 223 | $(testscripts) $(testdata) $(testiactdata) \ |
| 224 | $(testiactevents) | 224 | $(testiactevents) |
| 225 | 225 | ||
| 226 | -# Add install hook rule to create symbolic links for cscripts | 226 | +# Add install hook rule to copy cscripts without .py into the bindir |
| 227 | install-data-hook: | 227 | install-data-hook: |
| 228 | @binlist='$(binscripts)';\ | 228 | @binlist='$(binscripts)';\ |
| 229 | for p in $$binlist; do \ | 229 | for p in $$binlist; do \ |
| @@ -232,11 +232,11 @@ install-data-hook: | @@ -232,11 +232,11 @@ install-data-hook: | ||
| 232 | @linklist='$(linkscripts)';\ | 232 | @linklist='$(linkscripts)';\ |
| 233 | for p in $$linklist; do \ | 233 | for p in $$linklist; do \ |
| 234 | rm -rf "$(DESTDIR)$(bindir)/$$p"; \ | 234 | rm -rf "$(DESTDIR)$(bindir)/$$p"; \ |
| 235 | - ln -s "$(DESTDIR)$(pyexecdir)/cscripts/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \ | ||
| 236 | - chmod +x "$(DESTDIR)$(pyexecdir)/cscripts/$$p.py"; \ | 235 | + cp "$(DESTDIR)$(pyexecdir)/cscripts/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \ |
| 236 | + chmod +x "$(DESTDIR)$(bindir)/$$p"; \ | ||
| 237 | done | 237 | done |
| 238 | 238 | ||
| 239 | -# Uninstall hook rule to remove the symbolic links for cscripts | 239 | +# Uninstall hook rule to remove the cscripts from the bindir |
| 240 | uninstall-hook: | 240 | uninstall-hook: |
| 241 | @linklist='$(linkscripts)';\ | 241 | @linklist='$(linkscripts)';\ |
| 242 | for p in $$linklist; do \ | 242 | for p in $$linklist; do \ |