Permalink
Browse files

Minor changes to prepare for the 0.3.alpha1 release.

- Move the tar files for benchmarks/osh-runtime.sh to the _deps dir. We
  want to delete stuff in _tmp without clobbering them.
- Remove all the test files before scripts/release.sh build-and-test.
  - Update the comment to reflect the release tree structure.
- Update version number.
  • Loading branch information...
Andy Chu
Andy Chu committed Dec 9, 2017
1 parent 496dc46 commit 0c1f78a8945c20057f776bb500090495e00eebe6
Showing with 28 additions and 21 deletions.
  1. +3 −3 INSTALL.txt
  2. +3 −2 benchmarks/osh-runtime.sh
  3. +1 −1 doc/release-index.md
  4. +1 −1 oil-version.txt
  5. +20 −14 scripts/release.sh
View
@@ -12,8 +12,8 @@ Quick Start
If you haven't already done so, extract the tarball:
tar -x --xz < oil-0.2.0.tar.xz
cd oil-0.2.0
tar -x --xz < oil-0.3.alpha1.tar.xz
cd oil-0.3.alpha1
Either install as /usr/local/bin/osh:
@@ -31,7 +31,7 @@ The latter doesn't require root access, but it requires ~/bin to be in your
PATH.
NOTE: Out-of-tree builds are NOT currently supported, so you have to be in the
oil-0.2.0 directory.
oil-0.3.alpha1 directory.
Smoke Test
----------
@@ -13,7 +13,7 @@ source test/common.sh
source benchmarks/common.sh # csv-concat
readonly BASE_DIR=_tmp/osh-runtime
readonly TAR_DIR=$PWD/$BASE_DIR # Make it absolute
readonly TAR_DIR=$PWD/_deps/osh-runtime # Make it absolute
# Use the compiled version. Otherwise /proc/self/exe is the Python
# interpreter, which matters for yash's configure script!
@@ -41,12 +41,13 @@ EOF
}
download() {
mkdir -p $TAR_DIR
files | xargs -n 1 -I {} --verbose -- \
wget --directory $TAR_DIR 'https://www.oilshell.org/blob/testdata/{}'
}
extract() {
time for f in $TAR_DIR/*.{gz,bz2,xz}; do
time for f in $TAR_DIR/*.{bz2,xz}; do
tar -x --directory $TAR_DIR --file $f
done
ls -l $TAR_DIR
View
@@ -1,6 +1,6 @@
<!-- NOTE: This file is at /release/$VERSION/index.html -->
Oil Version 0.2.0
Oil Version 0.3.alpha1
-----------------
### What's New
View
@@ -1,4 +1,4 @@
0.2.0
0.3.alpha1
# The first line of this file is the Oil version, and the rest is ignored.
# It's used at build time for the release tarball, and at runtime for oil
View
@@ -4,6 +4,7 @@
# ./release.sh <function name>
#
# Steps:
# build/doc.sh update-src-versions (optional)
# $0 build-and-test (runs spec tests, etc.)
# test/wild.sh all
# benchmarks/auto.sh all on both flanders and lisa
@@ -37,7 +38,7 @@ log() {
# opy-releases.html (later)
# release/
# $VERSION/
# index.html # links to all this stuff
# index.html # release page, from doc/release-index.md
# oil-version.txt
# release-date.txt
# announcement.html # HTML redirect
@@ -46,40 +47,45 @@ log() {
# INSTALL.html
# osh-quick-ref.html
# test/ # results
# spec/
# spec.wwz/
# machine-lisa/
# wild.wwz/
# unit/
# wild/
# gold/
# tarball/ # log of building and running the tarball?
# asan/ # spec tests or other?
# # or it can be put under test/{spec,wild}
# metrics/ # static metrics on source code?
# # could also do cloc?
# loc-src.txt # oil, tools, etc.
# loc-pydeps.txt (build/stats.sh line counts)
# loc-nativedeps.txt
# line-counts.wwz/
# nativedeps.txt (build/stats.sh line counts)
# number of functions, classes, etc.?
# bytecode/bundle size, binary size on x86_64
# tarball size?
# coverage/ # coverage of all spec tests? And gold tests maybe?
# python/ # python stdlib coverage with pycoverage
# c/ # c coverage with gcc/clang
# benchmarks.wwz/
# machine-lisa/
# proc/meminfo etc.
# compile time on my machine (serial, optimized, etc.)
# startup time for hello world
# osh speed test, opy compiling, etc.
# machine-pizero/
# osh-parser/
# osh-runtime/
# vm-baseline/
# oheap/
# ...
# startup/
# download/
# 0.0.0/ # TODO: Add version here, so we can have binaries too?
# oil-0.0.0.tar.xz
# NOTE: Also need build/doc.sh update-src-versions to change doc/index.md, etc.
remove-files() {
rm -r -f \
_devbuild _build _release \
_tmp/{spec,wild,unit} \
_tmp/{osh-parser,osh-runtime,vm-baseline,oheap} \
_tmp/metrics
}
build-and-test() {
rm -r -f _devbuild _build _release
remove-files
rm -f _bin/oil.*
build/dev.sh pylibc # for libc.so, needed to crawl deps

0 comments on commit 0c1f78a

Please sign in to comment.