Commits

Peter Szilagyi committed 71999fb

I think bin/check has been replaced by 'make all' in elisp/omake.

  • Participants
  • Parent commits 0fb8ff0

Comments (0)

Files changed (3)

File bin/check

-#!/bin/bash
-set -e -u -o pipefail
-set -x
-
-# Create a single file with all the elisp files and compile it to make
-# sure there are no errors
-
-tmp_file=/tmp/all.el
-
-home=$(dirname $0)/..
-cd $home
-home=$(pwd -L)
-bin=$home/bin
-contrib_dir=$home/elisp/contrib
-jane_dir=$home/elisp/jane
-omake_dir=$home/elisp/omake
-
-# echo "home: $home"
-# exit 1
-
-top_files="
-jane-common"
-
-omake_files="
-omake-custom
-omake-file
-omake-errors
-omake-version
-omake-face
-omake-id
-omake-path
-omake-progress
-omake-window
-omake-error
-omake-ring
-omake-failure
-omake-result
-omake-status
-omake-buffer
-omake-spinner
-omake-inotify
-omake-model
-omake-project
-omake-env
-omake-ocaml
-omake-filter
-omake-connection
-omake-server
-omake-ping
-omake-timer
-omake-interface
-omake-setup"
-
-rm -f $tmp_file
-cat > $tmp_file <<EOF
-(eval-when-compile
-  (require 'cl)
-  (require 'bytecomp)
-  (setq byte-compile-warnings (remove 'cl-functions byte-compile-warning-types))
-  (add-to-list 'load-path "$contrib_dir"))
-EOF
-
-function e {
-    echo $1 >> $tmp_file
-}
-
-function emit {
-    e ";; -----------------------------------------------------------------------------"
-    e ";; $1"
-    e ";; -----------------------------------------------------------------------------"
-}
-
-# for file in $top_files; do
-#     emit $file
-#     cat $home/$file.el >> $tmp_file
-# done
-
-for file in $omake_files; do
-    emit $file
-    cat $omake_dir/$file.el >> $tmp_file
-done
-
-batch=/tmp/batch.txt
-
-# Try to compile the file
-emacs -q --no-site-file -batch -f batch-byte-compile $tmp_file &> $batch
-
-if grep "Error\|Warning" $batch &> /dev/null; then
-    echo "check.sh: compilation failed"
-    cat $batch
-    exit 1
-fi
-
-# CR seanmcl: Testing is broken at the moment
-
-# Run tests in the file
-# emacs -q --no-site-file -batch -L $contrib_dir -l ert -l $tmp_file -f ert-run-tests-batch-and-exit &> $batch
-
-# if grep "unexpected" $batch &> /dev/null; then
-#     echo "check.sh: tests failed"
-#     cat $batch
-#     exit 1
-# fi
-
-# # run server tests
-# if [ -e $bin/omake_server.exe ]; then
-#     $home/ocaml/omake/test/runtests.sh
-# fi

File elisp/omake/Makefile

 	emacs -q --no-site-file -batch -L ../core -l ../core/byte-compile-header.el -f batch-byte-compile $<
 
 test :
-	emacs -q --no-site-file -batch -L ../core -L . -l omake-unit-tests -f ert-run-tests-batch-and-exit
+	emacs -q --no-site-file -batch -L ../core -L . -L ../contrib -l omake-unit-tests -f ert-run-tests-batch-and-exit
 
 .PHONY: all
 all : $(elc)

File elisp/omake/OMakefile

-runtest:
+runtest: Makefile
 	make all clean