Skip to content

Commit e06738a

Browse files
committed
fix(template-engine): removed gsl, added pyratemp
As GSL failed in my first attempt to get the example program going, it might be better to try something else before too much time is spend. Fortunately, pyratemp **seems** to be something usable, and even if not, it might be possible to make it usable as it's just a 'simple' python script that I might be able to understand, if need be.
1 parent f2ca8c3 commit e06738a

8 files changed

Lines changed: 244 additions & 310 deletions

File tree

Makefile

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,24 @@
33
include Makefile.helpers
44

55
PYTHON = python2.7
6-
CONVERT = $(PYTHON) ./etc/bin/json2xml.py
7-
GSL = ./etc/bin/gsl_$(OS)-$(ARCH) -q
6+
TPL = etc/bin/pyratemp.py
87

98
API_DEPS = .api.deps
10-
API_SHARED_XML = ./etc/api/shared.xml
9+
API_SHARED_INFO = ./etc/api/shared.yml
1110
API_JSON_FILES = $(shell find ./etc -type f -name '*-api.json')
12-
API_XML_FILES = $(patsubst %.json,%.xml,$(API_JSON_FILES))
1311

1412
help:
1513
$(info Programs)
1614
$(info ----> GSL: '$(GSL)')
17-
$(info ----> json2xml: '$(CONVERT)')
15+
$(info ----> templat engine: '$(TPL)')
1816
$(info )
1917
$(info Targets)
2018
$(info help - print this help)
21-
$(info json-to-xml - convert json API files to xml for consumption by GSL)
2219
$(info api-deps - generate a file to tell make what API file dependencies will be)
2320

2421
json-to-xml: $(API_XML_FILES)
25-
$(API_DEPS): $(API_SHARED_XML)
26-
$(GSL) -script:src/gsl/deps.gsl $(API_SHARED_XML)
27-
28-
%.xml: %.json
29-
$(CONVERT) --pretty -o $@ < $<
22+
$(API_DEPS): $(API_SHARED_INFO)
23+
$(TPL) -f $(API_SHARED_INFO) -d DEP_FILE=$@
3024

3125
api-deps: $(API_DEPS)
3226

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,10 @@ The license of everything not explicitly under a different license are licensed
2121

2222
What follows is a list of other material that is licensed differently.
2323

24-
* **./etc/bin/json2xml.py** is licensed like MIT, as shown in the header of the file. See original source [on github][html2json].
25-
* **./etc/bin/gsl_\*** is licensed under [GNU GPL][imatix-copying]. The source code is [on github][gsl].
24+
* **./etc/bin/pyratemp.py** is licensed under MIT, as shown in [the header][pyratemp-header] of the file.
2625
* **./etc/api/\*\*/*.json** are licensed under a [MIT-like google license][google-lic].
2726

2827

2928
[oauth]: https://crates.io/crates/yup-oauth2
30-
[html2json]: https://github.com/hay/xml2json
31-
[imatix-copying]: https://github.com/imatix/gsl/blob/master/COPYING
32-
[gsl]: https://github.com/imatix/gsl
29+
[pyratemp-header]: https://github.com/Byron/youtube-rs/blob/master/etc/bin/pyratemp.py
3330
[google-lic]: https://github.com/google/google-api-go-client/blob/master/LICENSE
File renamed without changes.

etc/bin/gsl_LINUX-AMD64

-661 KB
Binary file not shown.

etc/bin/gsl_OSX-AMD64

-588 KB
Binary file not shown.

etc/bin/json2xml.py

Lines changed: 0 additions & 285 deletions
This file was deleted.

0 commit comments

Comments
 (0)