Skip to content

Commit

Permalink
RC for next version (#34)
Browse files Browse the repository at this point in the history 
Lots of polish work:

1. The 3rd party libraries needed by nimutils are all moved here.
2. Integrated my lock-free hash table.
3. Fixed a bug that was causing stuff to disappear in chalk sometimes.
4. Fleshed out the rope API with LOTS of niceties.
5. Documented most calls worth documenting (stuff I don't plan to deprecate mainly is what remains).

#3 was the hardest... basically I kept trying to figure out what was happening, so kept rewriting bits more cleanly,  and eventually seemed like it was worth finishing #4. 

And now, for at least 5 minutes, I don't know of any rendering issues (even in the release I knew of a couple but there were workarounds for anything that would show).
  • Loading branch information
@viega
viega authored Nov 17, 2023
1 parent b83531b commit 5b97ca1
Show file tree
Hide file tree
Showing 87 changed files with 5,538 additions and 1,789 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
tags
nimutils.out
298 changes: 298 additions & 0 deletions bin/buildlibs.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,298 @@
#!/bin/bash

function color {
case $1 in
black) CODE=0 ;;
red) CODE=1 ;; RED) CODE=9 ;;
green) CODE=2 ;; GREEN) CODE=10 ;;
yellow) CODE=3 ;; YELLOW) CODE=11 ;;
blue) CODE=4 ;; BLUE) CODE=12 ;;
magenta) CODE=5 ;; MAGENTA) CODE=13 ;;
cyan) CODE=6 ;; CYAN) CODE=14 ;;
white) CODE=7 ;; WHITE) CODE=15 ;;
grey) CODE=8 ;; *) CODE=$1 ;;
esac
shift

export TERM=${TERM:-vt100}
echo -n $(tput -T ${TERM} setaf ${CODE})$@$(tput -T ${TERM} op)
}

function colorln {
echo $(color $@)
}

if [[ ${#} -eq 0 ]] ; then
colorln RED Script requires an argument pointing to the deps directory
exit 1
fi

ARCH=$(uname -m)
OS=$(uname -o 2>/dev/null)
if [[ $? -ne 0 ]] ; then
# Older macOS/OSX versions of uname don't support -o
OS=$(uname -s)
fi

if [[ ${OS} = "Darwin" ]] ; then
# Not awesome, but this is what nim calls it.
OS=macosx

# We might be running virtualized, so do some more definitive
# tesitng. Note that there's no cross-compiling flag; if you
# want to cross compile, you currently need to manually build
# these libs.
SYSCTL=$(sysctl -n sysctl.proc_translated 2>/dev/null)
if [[ ${SYSCTL} = '0' ]] || [[ ${SYSCTL} == '1' ]] ; then
NIMARCH=arm64
else
NIMARCH=amd64
fi
else
# We don't support anything else at the moment.
OS=linux
if [[ ${ARCH} = "x86_64" ]] ; then
NIMARCH=amd64
else
NIMARCH=arm64
fi
fi

DEPS_DIR=${DEPS_DIR:-${HOME}/.local/c0}

PKG_LIBS=${1}/lib/${OS}-${NIMARCH}
MY_LIBS=${DEPS_DIR}/libs
SRC_DIR=${DEPS_DIR}/src
MUSL_DIR=${DEPS_DIR}/musl
MUSL_GCC=${MUSL_DIR}/bin/musl-gcc

mkdir -p ${MY_LIBS}

# The paste doesn't work from stdin on MacOS, so leave this as is, please.
export OPENSSL_CONFIG_OPTS=$(echo "
enable-ec_nistp_64_gcc_128
no-afalgeng
no-apps
no-bf
no-camellia
no-cast
no-comp
no-deprecated
no-des
no-docs
no-dtls
no-dtls1
no-egd
no-engine
no-err
no-idea
no-md2
no-md4
no-mdc2
no-psk
no-quic
no-rc2
no-rc4
no-rc5
no-seed
no-shared
no-srp
no-ssl
no-tests
no-tls1
no-tls1_1
no-uplink
no-weak-ssl-ciphers
no-zlib
" | tr '\n' ' ')

function copy_from_package {
for item in ${@}
do
if [[ ! -f ${MY_LIBS}/${item} ]] ; then
if [[ ! -f ${PKG_LIBS}/${item} ]] ; then
return 1
else
cp ${PKG_LIBS}/${item} ${MY_LIBS}
echo $(color GREEN Installed ${item} to:) ${MY_LIBS}
fi
fi
done
return 0
}

function get_src {
mkdir -p ${SRC_DIR}
cd ${SRC_DIR}

if [[ ! -d ${SRC_DIR}/${1} ]] ; then
echo $(color CYAN Downloading ${1} from:) ${2}
git clone ${2}
fi
if [[ ! -d ${1} ]] ; then
echo $(color RED Could not create directory: ) ${SRC_DIR}/${1}
exit 1
fi
cd ${1}
}

function ensure_musl {
if [[ ${OS} = "macosx" ]] ; then
return
fi
if [[ ! -f ${MUSL_GCC} ]] ; then
# if musl-gcc is already installed, use it
existing_musl=$(which musl-gcc 2> /dev/null)
if [[ -n "${existing_musl}" ]]; then
mkdir -p $(dirname ${MUSL_GCC})
ln -s ${existing_musl} ${MUSL_GCC}
echo $(color GREEN Linking existing musl-gcc: ) ${existing_musl} $(color GREEN "->" ) ${MUSL_GCC}
fi
fi
if [[ ! -f ${MUSL_GCC} ]] ; then
get_src musl git://git.musl-libc.org/musl
colorln CYAN Building musl
unset CC
./configure --disable-shared --prefix=${MUSL_DIR}
make clean
make
make install
mv lib/*.a ${MY_LIBS}

if [[ -f ${MUSL_GCC} ]] ; then
echo $(color GREEN Installed musl wrapper to:) ${MUSL_GCC}
else
colorln RED Installation of musl failed!
exit 1
fi
fi
export CC=${MUSL_GCC}
export CXX=${MUSL_GCC}
}

function install_kernel_headers {
if [[ ${OS} = "macosx" ]] ; then
return
fi
colorln CYAN Installing kernel headers needed for musl install
get_src kernel-headers https://github.com/sabotage-linux/kernel-headers.git
make ARCH=${ARCH} prefix= DESTDIR=${MUSL_DIR} install
}

function ensure_openssl {

if ! copy_from_package libssl.a libcrypto.a ; then
ensure_musl
install_kernel_headers

get_src openssl https://github.com/openssl/openssl.git
colorln CYAN Building openssl
if [[ ${OS} == "macosx" ]]; then
./config ${OPENSSL_CONFIG_OPTS}
else
./config ${OPENSSL_CONFIG_OPTS} -static
fi
make clean
make build_libs
mv *.a ${MY_LIBS}
if [[ -f ${MY_LIBS}/libssl.a ]] && [[ -f ${MY_LIBS}/libcrypto.a ]] ; then
echo $(color GREEN Installed openssl libs to:) ${MY_LIBS}
else
colorln RED Installation of openssl failed!
exit 1
fi
fi
}

function ensure_pcre {
if ! copy_from_package libpcre.a ; then

get_src pcre https://github.com/luvit/pcre.git
colorln CYAN "Building libpcre"
# For some reason, build fails on arm if we try to compile w/ musl?
unset CC
./configure --disable-cpp --disable-shared
make clean
make

mv .libs/libpcre.a ${MY_LIBS}
if [[ -f ${MY_LIBS}/libpcre.a ]] ; then
echo $(color GREEN Installed libpcre to:) ${MY_LIBS}/libpcre.a
else
colorln RED "Installation of libprce failed. This may be due to missing build dependencies. Please make sure autoconf, m4 and perl are installed."
exit 1
fi
fi
}

function ensure_gumbo {
if ! copy_from_package libgumbo.a ; then
ensure_musl
get_src sigil-gumbo https://github.com/Sigil-Ebook/sigil-gumbo/
colorln CYAN "Watching our waistline, selecting only required gumbo ingredients..."
cat > CMakeLists.txt <<EOL
cmake_minimum_required( VERSION 3.0 )
project(gumbo)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY \${PROJECT_BINARY_DIR}/.libs)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY \${PROJECT_BINARY_DIR}/.libs)
set(TOP_BUILD_LEVEL \${PROJECT_BINARY_DIR})
set(GUMBO_STATIC_LIB 1)
set(GUMBO_IS_SUBTREE 0)
add_subdirectory(src/)
EOL
colorln CYAN "Cooking up some gumbo"
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DGUMBO_STATIC_LIB=1 ..
make -j4
mv .libs/libgumbo.a ${MY_LIBS}
if [[ -f ${MY_LIBS}/libgumbo.a ]] ; then
echo $(color GREEN Your gumbo is installed to:) ${MY_LIBS}/libgumbo.a
else
colorln RED "Installation of gumbo failed!"
exit 1
fi
fi
}

function ensure_hatrack {
if ! copy_from_package libhatrack.a ; then
get_src hatrack https://github.com/viega/hatrack
aclocal
autoheader
autoconf
automake
./configure
make libhatrack.a
if [[ -f ${MY_LIBS}/libhatrack.a ]] ; then
echo $(color GREEN Installed libhatrack to:) ${MY_LIBS}/libhatrack.a
fi
fi
}

function remove_src {
# Don't nuke the src if CON4M_DEV is on.
if [[ -d ${SRC_DIR} ]] ; then
if [[ -z ${CON4M_DEV+woo} ]] ; then
colorln CYAN Removing code \(because CON4M_DEV is not set\)
rm -rf ${SRC_DIR}
else
colorln CYAN Keeping source code \(CON4M_DEV is set\)
fi
fi
}

ensure_musl
ensure_openssl
ensure_pcre
ensure_gumbo
ensure_hatrack

colorln GREEN All dependencies satisfied.
remove_src
74 changes: 74 additions & 0 deletions bin/header_install.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
#!/bin/bash

function color {
case $1 in
black) CODE=0 ;;
red) CODE=1 ;; RED) CODE=9 ;;
green) CODE=2 ;; GREEN) CODE=10 ;;
yellow) CODE=3 ;; YELLOW) CODE=11 ;;
blue) CODE=4 ;; BLUE) CODE=12 ;;
magenta) CODE=5 ;; MAGENTA) CODE=13 ;;
cyan) CODE=6 ;; CYAN) CODE=14 ;;
white) CODE=7 ;; WHITE) CODE=15 ;;
grey) CODE=8 ;; *) CODE=$1 ;;
esac
shift

echo -n $(tput setaf ${CODE})$@$(tput op)
}

function colorln {
echo $(color $@)
}

function to_abs_dir {
pushd $1 > /dev/null
echo `pwd`
popd > /dev/null
}

SRC_DIR=$(to_abs_dir ${NIMUTILS_DIR:-.}/nimutils/c)
DST_DIR=${HEADER_DIR:-~/.local/c0/include}

mkdir -p $DST_DIR

DST_DIR=$(to_abs_dir $DST_DIR)

function copy_news {
# $1 -- source directory
# $2 -- destination directory
# $3 -- file name.

SRC_FILE=$1/$3
DST_FILE=$2/$3

if [[ $SRC_FILE -nt $DST_FILE ]]; then
if [[ ! -e $SRC_FILE ]]; then
echo $(color RED error:) specified 'cp ${SRC_FILE} ${DST_FILE}' but the source file does not exist.
else
if [[ ! -e $DST_FILE ]]; then
echo $(color YELLOW "Copying new file: ") $3
echo $(color YELLOW to: ) $DST_FILE
else
echo $(color GREEN "Updating file:" ) $3
echo $(color GREEN full location: $DST_FILE)
fi
cp $SRC_FILE $DST_FILE
fi
fi
}

function push_ext_files {
# $1 is the src dir
# $2 is the dst dir
# $3 is the extension
pushd $1 >/dev/null

for item in `ls *.$3`; do
copy_news $1 $2 $item
done

popd >/dev/null
}

push_ext_files ${SRC_DIR} ${DST_DIR} h
Loading

0 comments on commit 5b97ca1

Please sign in to comment.