Commit 0313bc75 authored by Vitaly Lipatov's avatar Vitaly Lipatov

use UNISET_CODEGEN for uniset-codegen command

parent 1a4d1f66
...@@ -5,7 +5,7 @@ test_SOURCES = TestGen_SK.cc TestGen.cc TestGen-main.cc ...@@ -5,7 +5,7 @@ test_SOURCES = TestGen_SK.cc TestGen.cc TestGen-main.cc
GENERATED=TestGen_SK.h TestGen_SK.cc TestGen-main.cc GENERATED=TestGen_SK.h TestGen_SK.cc TestGen-main.cc
$(GENERATED): ../@PACKAGE@-codegen testgen.src.xml ../*.xsl $(GENERATED): ../@PACKAGE@-codegen testgen.src.xml ../*.xsl
sh ../uniset-codegen --local-include -l --path ../ --ask -n TestGen testgen.src.xml @UNISET_CODEGEN@ --local-include -l --ask -n TestGen testgen.src.xml
clean-local: clean-local:
rm -rf $(GENERATED) rm -rf $(GENERATED)
......
...@@ -152,6 +152,6 @@ PARAMS=$( echo \ ...@@ -152,6 +152,6 @@ PARAMS=$( echo \
# --stringparam ADD_HH_INC "${add_hh_inc}" \ # --stringparam ADD_HH_INC "${add_hh_inc}" \
# generate xxx_SK class # generate xxx_SK class
xsltproc ${PARAMS} ${xsltdir}/${xls_h} $xmlfile > $uni_h xsltproc ${PARAMS} ${xsltdir}/${xls_h} $xmlfile > $uni_h || rm -f $uni_h
xsltproc ${PARAMS} ${xsltdir}/${xls_c} $xmlfile > $uni_cc xsltproc ${PARAMS} ${xsltdir}/${xls_c} $xmlfile > $uni_cc || rm -f $uni_cc
[ -n "$no_main" ] || xsltproc ${PARAMS} ${xsltdir}/${xls_m} $xmlfile > $uni_main [ -n "$no_main" ] || xsltproc ${PARAMS} ${xsltdir}/${xls_m} $xmlfile > $uni_main || rm -f $uni_main
...@@ -119,6 +119,12 @@ fi ...@@ -119,6 +119,12 @@ fi
AC_SUBST(DOXYGEN) AC_SUBST(DOXYGEN)
AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN != x) AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN != x)
if test "x$UNISET_CODEGEN" = x ; then
UNISET_CODEGEN="sh $(top_builddir)/Utilities/codegen/uniset-codegen --path $(top_builddir)/Utilities/codegen/"
fi
AC_SUBST(UNISET_CODEGEN)
echo "UNISET_CODEGEN: $UNISET_CODEGEN"
# Checks for header files. # Checks for header files.
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_HEADER_STDC AC_HEADER_STDC
......
...@@ -81,3 +81,4 @@ EXFILE="$EXPORTPATH/extensions/RTUExchange libUniSetRTU.pc" ...@@ -81,3 +81,4 @@ EXFILE="$EXPORTPATH/extensions/RTUExchange libUniSetRTU.pc"
export UNISET_EXT_RTU_CFLAGS="$( ext_cflags $EXFILE )" export UNISET_EXT_RTU_CFLAGS="$( ext_cflags $EXFILE )"
export UNISET_EXT_RTU_LIBS="$( ext_libs $EXFILE )" export UNISET_EXT_RTU_LIBS="$( ext_libs $EXFILE )"
export UNISET_CODEGEN="sh $EXPORTPATH/Utilities/codegen/uniset-codegen --path $EXPORTPATH/Utilities/codegen"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment