Project

General

Profile

Revision a86bae77

View differences:

Makefile.in
36 36

  
37 37
clean: clean-lusic
38 38
	@make -C src clean
39
	
39

  
40 40
dist-src-clean: clean
41 41
	@rm -f config.log config.status include/*.lusic include/math.h include/conv.h include/mpfr_lustre.h
42 42

  
......
72 72
	mkdir -p ${datarootdir}
73 73
	install -m 0655 share/FindLustre.cmake ${datarootdir}
74 74

  
75
.PHONY: all compile-lusi doc dot lustrec lustrec.odocl clean install dist-clean
75
test-config: lustrec install
76
	if @PATH_TO_TESTS_DEFINED@; then \
77
	  mkdir -p test; \
78
	  cd test; \
79
	  cmake -DLUSTRE_PATH_HINT=${bindir} -DSUBPROJ=@GITBRANCH@ ../@PATH_TO_TESTS@; \
80
	fi
81

  
82
test-no-submit: test-config
83
	cd test; ctest -M Experimental -T Start -T Update -T Configure -T Build -T Test -R COMPIL_LUSTRE
84

  
85
test-submit: test-config
86
	cd test; ctest -M Experimental -T Submit -R COMPIL_LUSTRE
87

  
88
test: test-config
89
	cd test; ctest -D Experimental -R COMPIL_LUSTRE
90

  
91
test-full-no-submit: test-config
92
	cd test; ctest -M Experimental -T Start -T Update -T Configure -T Build -T Test 
93

  
94
test-full-submit: test-config
95
	cd test; ctest -M Experimental -T Submit 
96

  
97
test-full: test-config
98
	cd test; ctest -D Experimental 
99

  
100

  
101
.PHONY: all compile-lusi doc dot lustrec lustrec.odocl clean install dist-clean 
76 102

  
configure.ac
1 1
define([gitversion], esyscmd([sh -c "git log --oneline | wc -l | tr -d '\n'"]))
2

  
3
AC_INIT([lustrec], [1.4-gitversion], [ploc@garoche.net])
2
define([gitbranch], esyscmd([sh -c "git branch | grep \* | cut -d ' ' -f2"]))
3
AC_INIT([lustrec], 1.4-gitversion, [ploc@garoche.net])
4 4
AC_SUBST(VERSION_CODENAME, "Xia/Xiang-dev")
5
AC_SUBST(GITBRANCH, gitbranch)
5 6
# Next release will be
6 7
#AC_INIT([lustrec], [1.5], [ploc@garoche.net])
7 8
#AC_SUBST(VERSION_CODENAME, "Xia/Shao Kang")
......
90 91
mpfr=no])
91 92

  
92 93

  
93

  
94
# Checking availability of path to regression tests
95
tests_path="../lustrec-tests/regression_tests"
96

  
97
AC_ARG_WITH([tests-path],
98
            [AS_HELP_STRING([--with-tests-path],
99
               [provides path to test suite (default is ../lustrec-test if available)])],
100
            [tests_path="$withval";
101
	     if (test "x$tests_path" = xyes); then
102
	       AC_MSG_ERROR(Option --with-tests-path requires a parameter: eg. --with-tests-path=value);
103
	     fi],
104
            )
105
AC_MSG_NOTICE($tests_path)
106
AC_CHECK_FILE(${tests_path}/CMakeLists.txt,
107
              [
108
	      valid_test_path=true	
109
	      ],
110
	      [
111
	      valid_test_path=false
112
	        AC_SUBST(PATH_TO_TESTS, $tests_path)	      ])
113
AC_SUBST(PATH_TO_TESTS_DEFINED, $valid_test_path)
114
AC_SUBST(PATH_TO_TESTS, $tests_path)
94 115

  
95 116
# End of config
96 117

  
......
129 150
AC_MSG_NOTICE(********    Plugins    ********)
130 151

  
131 152
  if (test "x$gmp" = xyes -a "x$mpfr" = xyes ); then
132
      AC_MSG_NOTICE([-mpfr option enable])
153
      AC_MSG_NOTICE([MPFR option enabled])
133 154
  else 
134 155
      AC_MSG_WARN([MPFR option cannot be activated. Requires GMP and MPFR libs])
135 156
  fi
136 157

  
137
  if (test "x$salsa" = xyes -a "x$enable_salsa" = xyes); then
158
  if (test "x$salsa" = xyes -a "x$enable_salsa" != xno); then
138 159
      AC_MSG_NOTICE([Salsa plugin enabled])
139 160
  else 
140 161
      AC_MSG_NOTICE([Salsa plugin disabled])
141 162
  fi
142

  
163
AC_MSG_NOTICE(****** Regression Tests  ******)
164
if (test "x$valid_test_path" = xfalse); then
165
  AC_MSG_NOTICE(no valid tests path provided ($tests_path))
166
else
167
AC_MSG_NOTICE(tests path: $tests_path)
168
fi
143 169
AC_MSG_NOTICE(******** Configuration ********)
144 170
AC_MSG_NOTICE(Execute "make; make install" now)
src/version.ml.in
1 1

  
2
let number = "@PACKAGE_VERSION@"
2
let number = "@PACKAGE_VERSION@-@GITBRANCH@"
3 3

  
4 4
let codename ="@VERSION_CODENAME@"
5 5

  

Also available in: Unified diff