Skip to content

Commit

Permalink
[build] Remove py-yajl submodule!
Browse files Browse the repository at this point in the history
We're now using data_lang/j8
  • Loading branch information
Andy C committed Dec 29, 2023
1 parent 40052e9 commit a27a6da
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 51 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
@@ -1,4 +0,0 @@
[submodule "py-yajl"]
path = py-yajl
#url = ../../oilshell/py-yajl.git
url = https://github.com/oilshell/py-yajl.git
45 changes: 0 additions & 45 deletions build/py.sh
Expand Up @@ -343,48 +343,6 @@ posix_() {
py-ext-test pyext/posix_test.py
}

yajl-release() {
### Creates a py-yajl/yajl/yajl-2.1.1/ dir, used by build/ovm-compile.sh

pushd py-yajl/yajl >/dev/null
./configure
cmake .
make

#ls -l

# TODO: Run tests too? There are run_tests.sh files, but not all of them
# work.
popd >/dev/null
}

py-yajl-unit() {
pushd py-yajl >/dev/null
python2 tests/unit.py

echo
echo 'tests/issue11.py'
echo

zcat test_data/issue_11.gz | python2 tests/issue_11.py >/dev/null
popd >/dev/null
}

yajl() {
### Build and test yajl binding (depends on submodule)

log " (py-yajl/setup.py) -> yajl.so"

pushd py-yajl >/dev/null
python2 setup.py --quiet build_ext --inplace
popd >/dev/null

py-ext-test py-yajl-unit

# Link it in the repo root
ln -s -f py-yajl/yajl.so .
}

py-source() {
### Generate Python source code

Expand Down Expand Up @@ -414,9 +372,6 @@ py-extensions() {
line-input
posix_
fanos

# Require submodule
yajl
}

minimal() {
Expand Down
1 change: 0 additions & 1 deletion devtools/release.sh
Expand Up @@ -8,7 +8,6 @@
# Steps:
# edit oil-version.txt, build/doc.sh update-src-versions, bump devtools/release-note.sh
# $0 make-release-branch
# build/py.sh yajl-release
# $0 quick-oil-tarball # build FIRST tarball
# $0 test-oil-tar T # extract, build, install
# # for cpython-defs source scanning and dogfood
Expand Down
1 change: 0 additions & 1 deletion py-yajl
Submodule py-yajl deleted from 615ed2

0 comments on commit a27a6da

Please sign in to comment.