Skip to content

Commit d615852

Browse files
dwpaleydwpaley
committed
use ply main branch instead of release
1 parent e622503 commit d615852

File tree

7 files changed

+21
-45
lines changed

7 files changed

+21
-45
lines changed

‎Makefile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
329329
# Definitions to get versions of python3 PyCifRW and PLY
330330
#
331331
PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21
332-
PY3PLY = ply-3.11
332+
PY3PLY = ply
333333
PY3CIFRWFLAG = -DCBF_USE_PYCIFRW
334334
PY3CIFRW_PREFIX ?= $(HOME)/.local
335335
endif
@@ -765,7 +765,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz
765765
endif
766766
ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
767767
PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
768-
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
768+
PY3PLYURL = https://github.com/dabeaz/ply.git
769769
endif
770770
REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz
771771
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
@@ -1513,10 +1513,7 @@ build_py3ply: $(M4)/Makefile.m4
15131513
touch build_py3ply
15141514
$(PY3PLY): build_py3ply
15151515
-rm -rf $(PY3PLY)
1516-
-rm -rf $(PY3PLY).tar.gz
1517-
$(DOWNLOAD) $(PY3PLYURL)
1518-
tar -xvf $(PY3PLY).tar.gz
1519-
-rm $(PY3PLY).tar.gz
1516+
git clone $(PY3PLYURL)
15201517
(cd $(PY3PLY); \
15211518
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15221519
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \

‎Makefile_DIALS‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
327327
# Definitions to get versions of python3 PyCifRW and PLY
328328
#
329329
PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21
330-
PY3PLY = ply-3.11
330+
PY3PLY = ply
331331
PY3CIFRWFLAG = -DCBF_USE_PYCIFRW
332332
PY3CIFRW_PREFIX ?= $(HOME)/.local
333333
endif
@@ -694,7 +694,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz
694694
endif
695695
ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
696696
PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
697-
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
697+
PY3PLYURL = https://github.com/dabeaz/ply.git
698698
endif
699699
REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz
700700
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
@@ -1379,10 +1379,7 @@ build_py3ply: $(M4)/Makefile.m4
13791379
touch build_py3ply
13801380
$(PY3PLY): build_py3ply
13811381
-rm -rf $(PY3PLY)
1382-
-rm -rf $(PY3PLY).tar.gz
1383-
$(DOWNLOAD) $(PY3PLYURL)
1384-
tar -xvf $(PY3PLY).tar.gz
1385-
-rm $(PY3PLY).tar.gz
1382+
git clone $(PY3PLYURL)
13861383
(cd $(PY3PLY); \
13871384
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
13881385
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \

‎Makefile_LINUX‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
329329
# Definitions to get versions of python3 PyCifRW and PLY
330330
#
331331
PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21
332-
PY3PLY = ply-3.11
332+
PY3PLY = ply
333333
PY3CIFRWFLAG = -DCBF_USE_PYCIFRW
334334
PY3CIFRW_PREFIX ?= $(HOME)/.local
335335
endif
@@ -761,7 +761,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz
761761
endif
762762
ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
763763
PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
764-
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
764+
PY3PLYURL = https://github.com/dabeaz/ply.git
765765
endif
766766
REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz
767767
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
@@ -1509,10 +1509,7 @@ build_py3ply: $(M4)/Makefile.m4
15091509
touch build_py3ply
15101510
$(PY3PLY): build_py3ply
15111511
-rm -rf $(PY3PLY)
1512-
-rm -rf $(PY3PLY).tar.gz
1513-
$(DOWNLOAD) $(PY3PLYURL)
1514-
tar -xvf $(PY3PLY).tar.gz
1515-
-rm $(PY3PLY).tar.gz
1512+
git clone $(PY3PLYURL)
15161513
(cd $(PY3PLY); \
15171514
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15181515
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \

‎Makefile_MINGW‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
329329
# Definitions to get versions of python3 PyCifRW and PLY
330330
#
331331
PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21
332-
PY3PLY = ply-3.11
332+
PY3PLY = ply
333333
PY3CIFRWFLAG = -DCBF_USE_PYCIFRW
334334
PY3CIFRW_PREFIX ?= $(HOME)/.local
335335
endif
@@ -775,7 +775,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz
775775
endif
776776
ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
777777
PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
778-
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
778+
PY3PLYURL = https://github.com/dabeaz/ply.git
779779
endif
780780
REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz
781781
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
@@ -1523,10 +1523,7 @@ build_py3ply: $(M4)/Makefile.m4
15231523
touch build_py3ply
15241524
$(PY3PLY): build_py3ply
15251525
-rm -rf $(PY3PLY)
1526-
-rm -rf $(PY3PLY).tar.gz
1527-
$(DOWNLOAD) $(PY3PLYURL)
1528-
tar -xvf $(PY3PLY).tar.gz
1529-
-rm $(PY3PLY).tar.gz
1526+
git clone $(PY3PLYURL)
15301527
(cd $(PY3PLY); \
15311528
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15321529
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \

‎Makefile_MSYS2‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
328328
# Definitions to get versions of python3 PyCifRW and PLY
329329
#
330330
PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21
331-
PY3PLY = ply-3.11
331+
PY3PLY = ply
332332
PY3CIFRWFLAG = -DCBF_USE_PYCIFRW
333333
PY3CIFRW_PREFIX ?= $(HOME)/.local
334334
endif
@@ -760,7 +760,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz
760760
endif
761761
ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
762762
PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
763-
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
763+
PY3PLYURL = https://github.com/dabeaz/ply.git
764764
endif
765765
REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz
766766
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
@@ -1508,13 +1508,7 @@ build_py3ply: $(M4)/Makefile.m4
15081508
touch build_py3ply
15091509
$(PY3PLY): build_py3ply
15101510
-rm -rf $(PY3PLY)
1511-
-rm -rf $(PY3PLY).tar.gz
1512-
$(DOWNLOAD) $(PY3PLYURL)
1513-
tar -xvf $(PY3PLY).tar.gz
1514-
-rm $(PY3PLY).tar.gz
1515-
(cd $(PY3PLY); \
1516-
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
1517-
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
1511+
git clone $(PY3PLY); \
15181512
mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
15191513
$(PYTHON3) -m build --config-setting=install -C--prefix= -C--home=$(PY3CIFRW_PREFIX) )
15201514
endif

‎Makefile_OSX‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
329329
# Definitions to get versions of python3 PyCifRW and PLY
330330
#
331331
PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21
332-
PY3PLY = ply-3.11
332+
PY3PLY = ply
333333
PY3CIFRWFLAG = -DCBF_USE_PYCIFRW
334334
PY3CIFRW_PREFIX ?= $(HOME)/.local
335335
endif
@@ -759,7 +759,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz
759759
endif
760760
ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
761761
PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
762-
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
762+
PY3PLYURL = https://github.com/dabeaz/ply.git
763763
endif
764764
REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz
765765
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
@@ -1507,10 +1507,7 @@ build_py3ply: $(M4)/Makefile.m4
15071507
touch build_py3ply
15081508
$(PY3PLY): build_py3ply
15091509
-rm -rf $(PY3PLY)
1510-
-rm -rf $(PY3PLY).tar.gz
1511-
$(DOWNLOAD) $(PY3PLYURL)
1512-
tar -xvf $(PY3PLY).tar.gz
1513-
-rm $(PY3PLY).tar.gz
1510+
git clone $(PY3PLYURL)
15141511
(cd $(PY3PLY); \
15151512
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15161513
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \

‎m4/Makefile.m4‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
336336
# Definitions to get versions of python3 PyCifRW and PLY
337337
#
338338
PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21
339-
PY3PLY = ply-3.11
339+
PY3PLY = ply
340340
PY3CIFRWFLAG = -DCBF_USE_PYCIFRW
341341
PY3CIFRW_PREFIX ?= $(HOME)/.local
342342
endif
@@ -1134,7 +1134,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz
11341134
endif
11351135
ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes)
11361136
PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz
1137-
PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz
1137+
PY3PLYURL = https://github.com/dabeaz/ply.git
11381138
endif
11391139
REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz
11401140
TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz
@@ -1882,10 +1882,7 @@ build_py3ply: $(M4)/Makefile.m4
18821882
touch build_py3ply
18831883
$(PY3PLY): build_py3ply
18841884
-rm -rf $(PY3PLY)
1885-
-rm -rf $(PY3PLY).tar.gz
1886-
$(DOWNLOAD) $(PY3PLYURL)
1887-
tar -xvf $(PY3PLY).tar.gz
1888-
-rm $(PY3PLY).tar.gz
1885+
git clone $(PY3PLYURL)
18891886
(cd $(PY3PLY); \
18901887
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
18911888
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \

0 commit comments

Comments
 (0)