development packages are named devel in rpms, not dev
This commit is contained in:
27
ChangeLog
27
ChangeLog
@@ -1,3 +1,30 @@
|
|||||||
|
2015-11-07 10:47 marc
|
||||||
|
|
||||||
|
* bootstrap.sh: there is no qt4-default
|
||||||
|
|
||||||
|
2015-11-07 09:23 marc
|
||||||
|
|
||||||
|
* bootstrap.sh: there is no qt4-default
|
||||||
|
|
||||||
|
2015-11-05 09:54 marc
|
||||||
|
|
||||||
|
* ax_init_standard_project.m4, bootstrap.sh, build-in-docker.sh,
|
||||||
|
resolve-debbuilddeps.sh: updated build system
|
||||||
|
|
||||||
|
2015-11-03 22:54 marc
|
||||||
|
|
||||||
|
* debian/control.in, libxml-cxx.spec.in: update dependencies
|
||||||
|
|
||||||
|
2015-11-03 21:51 marc
|
||||||
|
|
||||||
|
* debian/control.in: updated dependencies
|
||||||
|
|
||||||
|
2015-11-03 14:27 marc
|
||||||
|
|
||||||
|
* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
|
||||||
|
bootstrap.sh, resolve-debbuilddeps.sh: prepared for build in a
|
||||||
|
docker instance on jenkins
|
||||||
|
|
||||||
2015-11-02 00:18 marc
|
2015-11-02 00:18 marc
|
||||||
|
|
||||||
* build-resource-file.sh, resolve-debbuilddeps.sh,
|
* build-resource-file.sh, resolve-debbuilddeps.sh,
|
||||||
|
@@ -13,6 +13,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
|
|||||||
for path in . .. ../..; do
|
for path in . .. ../..; do
|
||||||
if svn info $path 2>&1 > /dev/null; then
|
if svn info $path 2>&1 > /dev/null; then
|
||||||
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
||||||
|
if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
|
||||||
break;
|
break;
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -22,6 +23,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
|
|||||||
for path in . .. ../..; do
|
for path in . .. ../..; do
|
||||||
if svn info $path 2>&1 > /dev/null; then
|
if svn info $path 2>&1 > /dev/null; then
|
||||||
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
||||||
|
if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
|
||||||
break;
|
break;
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -36,6 +38,7 @@ m4_define(x_minor_diff, mrw_esyscmd_s([
|
|||||||
for path in . .. ../..; do
|
for path in . .. ../..; do
|
||||||
if svn info $path 2>&1 > /dev/null; then
|
if svn info $path 2>&1 > /dev/null; then
|
||||||
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
|
||||||
|
if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
|
||||||
break;
|
break;
|
||||||
fi;
|
fi;
|
||||||
done
|
done
|
||||||
@@ -164,14 +167,18 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
|||||||
AX_SUBST(BUILD_NUMBER)
|
AX_SUBST(BUILD_NUMBER)
|
||||||
BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
|
BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
|
||||||
AX_SUBST(BUILD_DATE)
|
AX_SUBST(BUILD_DATE)
|
||||||
if test -f "${PROJECT_NAME}-logo.png"; then
|
if test -f "${PACKAGE_NAME}.desktop.in"; then
|
||||||
PROJECT_LOGO="${PROJECT_NAME}-logo.png"
|
PACKAGE_DESKTOP="${PACKAGE_NAME}.desktop"
|
||||||
fi
|
fi
|
||||||
AX_SUBST(PROJECT_LOGO)
|
AX_SUBST(PACKAGE_DESKTOP)
|
||||||
if test -f "${PROJECT_NAME}-icon.png"; then
|
if test -f "${PACKAGE_NAME}-logo.png"; then
|
||||||
PROJECT_ICON="${PROJECT_NAME}-icon.png"
|
PACKAGE_LOGO="${PACKAGE_NAME}-logo.png"
|
||||||
fi
|
fi
|
||||||
AX_SUBST(PROJECT_ICON)
|
AX_SUBST(PACKAGE_LOGO)
|
||||||
|
if test -f "${PACKAGE_NAME}-icon.png"; then
|
||||||
|
PACKAGE_ICON="${PACKAGE_NAME}-icon.png"
|
||||||
|
fi
|
||||||
|
AX_SUBST(PACKAGE_ICON)
|
||||||
|
|
||||||
AC_ARG_ENABLE(pedantic,
|
AC_ARG_ENABLE(pedantic,
|
||||||
[AS_HELP_STRING([--enable-pedantic],
|
[AS_HELP_STRING([--enable-pedantic],
|
||||||
@@ -201,6 +208,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
|||||||
AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
|
AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test -f ${PACKAGE_NAME}.desktop.in; then
|
||||||
|
AC_CONFIG_FILES([${PACKAGE_NAME}.desktop])
|
||||||
|
fi
|
||||||
|
|
||||||
AC_CONFIG_FILES([makefile])
|
AC_CONFIG_FILES([makefile])
|
||||||
AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
|
AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
|
||||||
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
|
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
|
||||||
@@ -342,7 +353,7 @@ EOF
|
|||||||
|
|
||||||
# use this in configure.ac to support debian packages
|
# use this in configure.ac to support debian packages
|
||||||
AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
|
AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
|
||||||
README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g')
|
README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g')
|
||||||
AC_SUBST(README_DEB)
|
AC_SUBST(README_DEB)
|
||||||
_AM_SUBST_NOTMAKE([README_DEB])
|
_AM_SUBST_NOTMAKE([README_DEB])
|
||||||
AC_CONFIG_FILES([debian/changelog debian/control])
|
AC_CONFIG_FILES([debian/changelog debian/control])
|
||||||
|
97
bootstrap.sh
97
bootstrap.sh
@@ -110,17 +110,20 @@ GENERATED FILES
|
|||||||
* resolve-rpmbuilddeps.sh - script to install RPM package dependencies
|
* resolve-rpmbuilddeps.sh - script to install RPM package dependencies
|
||||||
* build-in-docker.sh - script to build the project encapsulated in a docker container
|
* build-in-docker.sh - script to build the project encapsulated in a docker container
|
||||||
* build-resource-file.sh - build resource.qrc file from a resource directory
|
* build-resource-file.sh - build resource.qrc file from a resource directory
|
||||||
|
* sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen
|
||||||
* mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
|
* mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
|
||||||
|
* test/runtests.sh - template file to run test scripts, i.e. docker based
|
||||||
* AUTHORS - replace your name in AUTHORS before first run
|
* AUTHORS - replace your name in AUTHORS before first run
|
||||||
* NEWS - empty file add your project's news
|
* NEWS - empty file add your project's news
|
||||||
* README - add project description (first line is header, followed by an empty line)
|
* README - add project description (first line is header, followed by an empty line)
|
||||||
* configure.ac - global configuration file template
|
* configure.ac - global configuration file template
|
||||||
* makefile.am - global makefile template
|
* makefile.am - global makefile template
|
||||||
|
* ${DEFAULT_PROJECT_NAME}.desktop.in - linux desktop file
|
||||||
* src/makefile.am - if you enabled AX_USE_CXX
|
* src/makefile.am - if you enabled AX_USE_CXX
|
||||||
* src/version.hxx - if you enabled AX_USE_CXX
|
* src/version.hxx - if you enabled AX_USE_CXX
|
||||||
* src/version.cxx - if you enabled AX_USE_CXX
|
* src/version.cxx - if you enabled AX_USE_CXX
|
||||||
* html/makefile.am - if you enabled AX_BUILD_HTML
|
* html/makefile.am - if you enabled AX_BUILD_HTML
|
||||||
* scripts/makefile.in - if you enabled AX_USE_SCRIPTS
|
* scripts/makefile.am - if you enabled AX_USE_SCRIPTS
|
||||||
* doc/makefile.am - if you enabled AX_USE_DOXYGEN
|
* doc/makefile.am - if you enabled AX_USE_DOXYGEN
|
||||||
* doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
|
* doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
|
||||||
* test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
|
* test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
|
||||||
@@ -196,7 +199,7 @@ FILES
|
|||||||
<ou can access the readme by calling
|
<ou can access the readme by calling
|
||||||
${DEFAULT_PROJECT_NAME}::description().
|
${DEFAULT_PROJECT_NAME}::description().
|
||||||
* ChangeLog: Your changelog is automatically maintained from
|
* ChangeLog: Your changelog is automatically maintained from
|
||||||
subversion history, using svn2cl | subversion-tools. You don't need to
|
subversion history, using svn2cl. You don't need to
|
||||||
care about.
|
care about.
|
||||||
* configure.ac: This file becomes very short and simple. You provide
|
* configure.ac: This file becomes very short and simple. You provide
|
||||||
the project name, the major and minor version. The
|
the project name, the major and minor version. The
|
||||||
@@ -320,7 +323,7 @@ checkdir() {
|
|||||||
|
|
||||||
checkfile() {
|
checkfile() {
|
||||||
exists=0
|
exists=0
|
||||||
if test -f "$1"; then
|
if test -f "$1" -o -f "$1".in; then
|
||||||
exists=1
|
exists=1
|
||||||
fi
|
fi
|
||||||
test $exists -eq 1
|
test $exists -eq 1
|
||||||
@@ -332,7 +335,7 @@ to() {
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
(--condition) shift # test for a tag, abort if not set
|
(--condition) shift # test for a tag, abort if not set
|
||||||
if ! testtag "$1"; then
|
if ! testtag "$1"; then
|
||||||
return
|
return 0
|
||||||
fi;;
|
fi;;
|
||||||
(--mode) shift # test for a tag, abort if not set
|
(--mode) shift # test for a tag, abort if not set
|
||||||
mode="$1";;
|
mode="$1";;
|
||||||
@@ -373,7 +376,14 @@ copy() {
|
|||||||
# file already exists and must not be rebuilt
|
# file already exists and must not be rebuilt
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
run cp "${0%/*}/$1" "$1"
|
local source="${0%/*}/$1"
|
||||||
|
if ! test -r "${source}"; then
|
||||||
|
source="../${source}"
|
||||||
|
if ! test -r "${source}"; then
|
||||||
|
source="${0%/*}/$1"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
run cp "${source}" "$1"
|
||||||
if test $exists -eq 0; then
|
if test $exists -eq 0; then
|
||||||
run svn add "$1"
|
run svn add "$1"
|
||||||
run svn propset svn:keywords "Id" "$1"
|
run svn propset svn:keywords "Id" "$1"
|
||||||
@@ -402,6 +412,12 @@ doxyadd() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Check if we are in subversion root, if so, create trunk, branches, tags:
|
||||||
|
if test "$(LANG= svn info | sed -n 's,Relative URL: *,,p')" = "^/"; then
|
||||||
|
svn mkdir trunk branches tags
|
||||||
|
cd trunk
|
||||||
|
fi
|
||||||
|
|
||||||
# Initialize the environment:
|
# Initialize the environment:
|
||||||
copy ${MY_NAME}
|
copy ${MY_NAME}
|
||||||
copy ax_init_standard_project.m4
|
copy ax_init_standard_project.m4
|
||||||
@@ -411,6 +427,7 @@ copy resolve-debbuilddeps.sh
|
|||||||
copy resolve-rpmbuilddeps.sh
|
copy resolve-rpmbuilddeps.sh
|
||||||
copy build-in-docker.sh
|
copy build-in-docker.sh
|
||||||
copy build-resource-file.sh
|
copy build-resource-file.sh
|
||||||
|
copy sql-to-dot.sed
|
||||||
copy mac-create-app-bundle.sh
|
copy mac-create-app-bundle.sh
|
||||||
AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1)
|
AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1)
|
||||||
if test -z "${AUTHOR}"; then
|
if test -z "${AUTHOR}"; then
|
||||||
@@ -427,8 +444,7 @@ ${DEFAULT_PROJECT_NAME}
|
|||||||
|
|
||||||
add description for ${DEFAULT_PROJECT_NAME}
|
add description for ${DEFAULT_PROJECT_NAME}
|
||||||
EOF
|
EOF
|
||||||
to configure.ac <<EOF && \
|
to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
|
||||||
( notice "please edit configure.ac, then rerun $0"; exit 0 )
|
|
||||||
${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
|
${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
|
||||||
m4_define(x_major, 0) # project's major version
|
m4_define(x_major, 0) # project's major version
|
||||||
m4_define(x_minor, 0) # project's minor version
|
m4_define(x_minor, 0) # project's minor version
|
||||||
@@ -691,17 +707,22 @@ namespace NAMESPACE {
|
|||||||
return README;
|
return README;
|
||||||
}
|
}
|
||||||
std::string logo() {
|
std::string logo() {
|
||||||
return PROJECT_LOGO;
|
return PACKAGE_LOGO;
|
||||||
}
|
}
|
||||||
std::string icon() {
|
std::string icon() {
|
||||||
return PROJECT_ICON;
|
return PACKAGE_ICON;
|
||||||
}
|
}
|
||||||
const std::string WHAT("#(@) " PACKAGE_STRING);
|
const std::string WHAT("#(@) " PACKAGE_STRING);
|
||||||
const std::string IDENT("\$Id: " PACKAGE_STRING);
|
const std::string IDENT("\$Id: " PACKAGE_STRING);
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
|
to --condition AX_USE_SCRIPTS scripts/makefile.am <<EOF
|
||||||
|
${HEADER}dist_bin_SCRIPTS =
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = makefile.in
|
||||||
|
EOF
|
||||||
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
|
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
|
||||||
|
to --condition AX_BUILD_TEST test/runtests.sh < ${0%/*}/test/runtests.sh
|
||||||
to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
|
to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
|
||||||
${HEADER}$(if testtag AX_USE_CXX; then
|
${HEADER}$(if testtag AX_USE_CXX; then
|
||||||
cat <<EOF2
|
cat <<EOF2
|
||||||
@@ -745,7 +766,7 @@ if testtag AX_USE_DOXYGEN; then
|
|||||||
doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
|
doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
|
||||||
doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
|
doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
|
||||||
doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
|
doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
|
||||||
doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
|
doxyreplace PROJECT_LOGO "@top_srcdir@/@PACKACE_LOGO@"
|
||||||
doxyreplace INLINE_INHERITED_MEMB YES
|
doxyreplace INLINE_INHERITED_MEMB YES
|
||||||
doxyreplace MULTILINE_CPP_IS_BRIEF YES
|
doxyreplace MULTILINE_CPP_IS_BRIEF YES
|
||||||
doxyreplace TAB_SIZE 2
|
doxyreplace TAB_SIZE 2
|
||||||
@@ -755,6 +776,7 @@ if testtag AX_USE_DOXYGEN; then
|
|||||||
doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
|
doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
|
||||||
doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
|
doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
|
||||||
doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
|
doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
|
||||||
|
doxyadd ALIASES '"api=\\xrefitem api \\"API Call\\" \\"\\""'
|
||||||
doxyreplace ENABLE_PREPROCESSING YES
|
doxyreplace ENABLE_PREPROCESSING YES
|
||||||
doxyreplace MACRO_EXPANSION YES
|
doxyreplace MACRO_EXPANSION YES
|
||||||
doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
|
doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
|
||||||
@@ -781,14 +803,14 @@ if testtag AX_USE_DOXYGEN; then
|
|||||||
if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
|
if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
|
||||||
doxyadd INPUT "@top_srcdir@/test"
|
doxyadd INPUT "@top_srcdir@/test"
|
||||||
fi
|
fi
|
||||||
doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt'
|
doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql'
|
||||||
doxyreplace RECURSIVE YES
|
doxyreplace RECURSIVE YES
|
||||||
doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
|
doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
|
||||||
if testtag AX_BUILD_EXAMPLES; then
|
if testtag AX_BUILD_EXAMPLES; then
|
||||||
doxyreplace EXAMPLE_PATH @top_srcdir@/examples
|
doxyreplace EXAMPLE_PATH @top_srcdir@/examples
|
||||||
fi
|
fi
|
||||||
doxyreplace EXAMPLE_RECURSIVE YES
|
doxyreplace EXAMPLE_RECURSIVE YES
|
||||||
doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed'
|
doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed'
|
||||||
doxyreplace SOURCE_BROWSER YES
|
doxyreplace SOURCE_BROWSER YES
|
||||||
doxyreplace INLINE_SOURCES YES
|
doxyreplace INLINE_SOURCES YES
|
||||||
doxyreplace GENERATE_TESTLIST YES
|
doxyreplace GENERATE_TESTLIST YES
|
||||||
@@ -806,7 +828,7 @@ if testtag AX_USE_DOXYGEN; then
|
|||||||
doxyreplace CLASS_GRAPH YES
|
doxyreplace CLASS_GRAPH YES
|
||||||
doxyreplace TEMPLATE_RELATIONS YES
|
doxyreplace TEMPLATE_RELATIONS YES
|
||||||
doxyreplace DOT_IMAGE_FORMAT svg
|
doxyreplace DOT_IMAGE_FORMAT svg
|
||||||
doxyreplace INTERACTIVE_SVG YES
|
doxyreplace INTERACTIVE_SVG NO
|
||||||
doxyreplace DOT_TRANSPARENT YES
|
doxyreplace DOT_TRANSPARENT YES
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -819,12 +841,12 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
|
|||||||
|
|
||||||
-- @AUTHOR@ @BUILD_DATE@
|
-- @AUTHOR@ @BUILD_DATE@
|
||||||
EOF
|
EOF
|
||||||
BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
|
BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
|
||||||
to debian/control.in <<EOF
|
to debian/control.in <<EOF
|
||||||
Source: @PACKAGE_NAME@
|
Source: @PACKAGE_NAME@
|
||||||
Priority: extra
|
Priority: extra
|
||||||
Maintainer: @AUTHOR@
|
Maintainer: @AUTHOR@
|
||||||
Build-Depends: ${BUILD-DEPENDS}
|
Build-Depends: ${BUILD_DEPENDS}
|
||||||
|
|
||||||
Package: @PACKAGE_NAME@
|
Package: @PACKAGE_NAME@
|
||||||
Section: $(if testtag AX_USE_LIBTOOL; then echo "libs"; fi)
|
Section: $(if testtag AX_USE_LIBTOOL; then echo "libs"; fi)
|
||||||
@@ -838,7 +860,7 @@ $( if testtag AX_USE_LIBTOOL; then
|
|||||||
Package: @PACKAGE_NAME@-dev
|
Package: @PACKAGE_NAME@-dev
|
||||||
Section: libdevel
|
Section: libdevel
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD-DEPENDS}
|
Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}
|
||||||
Description: @DESCRIPTION@ - Development Package
|
Description: @DESCRIPTION@ - Development Package
|
||||||
@README_DEB@
|
@README_DEB@
|
||||||
EOF2
|
EOF2
|
||||||
@@ -866,6 +888,17 @@ ${HEADER}%:
|
|||||||
EOF
|
EOF
|
||||||
echo 7 | to debian/compat
|
echo 7 | to debian/compat
|
||||||
fi
|
fi
|
||||||
|
to ${PACKAGE_NAME}.desktop.in <<EOF
|
||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=${PACKAGE_NAME}
|
||||||
|
GenericName=${PACKAGE_NAME}
|
||||||
|
Comment=@DESCRIPTION@
|
||||||
|
Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
|
||||||
|
Exec=${PACKAGE_NAME} %u
|
||||||
|
Terminal=false
|
||||||
|
Categories=Qt;Utility;
|
||||||
|
EOF
|
||||||
to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
|
to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
|
||||||
Summary: @DESCRIPTION@
|
Summary: @DESCRIPTION@
|
||||||
Name: @PACKAGE_NAME@
|
Name: @PACKAGE_NAME@
|
||||||
@@ -939,6 +972,7 @@ $(if testtag AX_USE_LIBTOOL; then
|
|||||||
echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
|
echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
|
||||||
else
|
else
|
||||||
echo '/usr/bin/*'
|
echo '/usr/bin/*'
|
||||||
|
echo '/usr/share/applications/*'
|
||||||
fi)
|
fi)
|
||||||
%doc
|
%doc
|
||||||
$(if testtag AX_USE_LIBTOOL; then
|
$(if testtag AX_USE_LIBTOOL; then
|
||||||
@@ -983,13 +1017,36 @@ fi)
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
SUBDIRS=""
|
SUBDIRS=""
|
||||||
|
if testtag AX_USE_CXX; then
|
||||||
|
SUBDIRS="${SUBDIRS} src"
|
||||||
|
fi
|
||||||
|
if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
|
||||||
|
SUBDIRS="${SUBDIRS} test"
|
||||||
|
fi
|
||||||
|
if testtag AX_USE_SCRIPTS; then
|
||||||
|
SUBDIRS="${SUBDIRS} scripts"
|
||||||
|
fi
|
||||||
|
if testtag AX_USE_DOXYGEN; then
|
||||||
|
SUBDIRS="${SUBDIRS} doc"
|
||||||
|
fi
|
||||||
|
if testtag AX_BUILD_EXAMPLES; then
|
||||||
|
SUBDIRS="${SUBDIRS} examples"
|
||||||
|
fi
|
||||||
|
if testtag AX_BUILD_HTML; then
|
||||||
|
SUBDIRS="${SUBDIRS} html"
|
||||||
|
fi
|
||||||
for d in src test scripts doc examples html; do
|
for d in src test scripts doc examples html; do
|
||||||
test -d $d && SUBDIRS="${SUBDIRS} $d"
|
if test -d "$d" -a "${SUBDIRS//$d/}" = "${SUBDIRS}"; then
|
||||||
|
SUBDIRS="${SUBDIRS} $d"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
to makefile.am<<EOF
|
to makefile.am<<EOF
|
||||||
${HEADER}SUBDIRS =${SUBDIRS}
|
${HEADER}SUBDIRS =${SUBDIRS}
|
||||||
|
|
||||||
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
|
desktopdir = \${datadir}/applications
|
||||||
|
desktop_DATA = @PACKAGE_DESKTOP@
|
||||||
|
dist_pkgdata_DATA = @PACKAGE_ICON@
|
||||||
|
dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = makefile.in
|
MAINTAINERCLEANFILES = makefile.in
|
||||||
EOF
|
EOF
|
||||||
@@ -1014,7 +1071,7 @@ if test -f makefile; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
#### Bootstrap Before Configure ####
|
#### Bootstrap Before Configure ####
|
||||||
run --no-check svn2cl | subversion-tools
|
run --no-check svn2cl
|
||||||
run aclocal
|
run aclocal
|
||||||
if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
|
if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
|
||||||
run automake -a
|
run automake -a
|
||||||
|
9
libxml-cxx.desktop.in
Normal file
9
libxml-cxx.desktop.in
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=libxml-cxx
|
||||||
|
GenericName=libxml-cxx
|
||||||
|
Comment=@DESCRIPTION@
|
||||||
|
Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
|
||||||
|
Exec=libxml-cxx %u
|
||||||
|
Terminal=false
|
||||||
|
Categories=Qt;Utility;
|
@@ -5,7 +5,7 @@ Release: @BUILD_NUMBER@%{?dist}
|
|||||||
License: LGPL
|
License: LGPL
|
||||||
Group: Development/Libraries/C++
|
Group: Development/Libraries/C++
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
BuildRequires: gnupg, subversion, automake, autoconf, doxygen, mrw-c++-dev
|
BuildRequires: gnupg, subversion, automake, autoconf, doxygen, mrw-c++-devel
|
||||||
%if 0%{?fedora} != 20
|
%if 0%{?fedora} != 20
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
%endif
|
%endif
|
||||||
|
@@ -11,25 +11,27 @@
|
|||||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
|
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
|
||||||
|
|
||||||
SCHROOTNAME="$1"
|
SCHROOTNAME="$1"
|
||||||
|
if test -n "${SCHROOTNAME}"; then
|
||||||
|
DO="schroot -c "${SCHROOTNAME}" --"
|
||||||
|
SUDO="schroot -c "${SCHROOTNAME}" -u root -d / --"
|
||||||
|
else
|
||||||
|
DO=""
|
||||||
|
SUDO="sudo"
|
||||||
|
fi
|
||||||
|
|
||||||
function install() {
|
function install() {
|
||||||
if test -n "${SCHROOTNAME}"; then
|
if ${SUDO} apt-get -y install $*; then
|
||||||
if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install $*; then
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
if apt-get -y install $*; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
return 1
|
return 1
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
TO_INSTALL=
|
TO_INSTALL=
|
||||||
|
|
||||||
if test -e debian/control.in -a ! -e debian/control; then
|
if test -e debian/control.in -a ! -e debian/control; then
|
||||||
for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
|
for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
|
||||||
if test -n "$(apt-cache policy -q ${f})" && ! dpkg -l "${f}"; then
|
if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then
|
||||||
TO_INSTALL+=" ${f}"
|
TO_INSTALL+=" ${f}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -38,13 +40,8 @@ if test -e debian/control.in -a ! -e debian/control; then
|
|||||||
sed 's,@[^@]*@, dummytext,g' > debian/control
|
sed 's,@[^@]*@, dummytext,g' > debian/control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "${SCHROOTNAME}"; then
|
install dpkg-dev
|
||||||
schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev
|
DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true)
|
||||||
DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true)
|
|
||||||
else
|
|
||||||
apt-get -y install dpkg-dev
|
|
||||||
DEPS=$(dpkg-checkbuilddeps 2>&1 || true)
|
|
||||||
fi
|
|
||||||
DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
|
DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
|
||||||
|
|
||||||
for pa in ${DEPS}; do
|
for pa in ${DEPS}; do
|
||||||
|
81
sql-to-dot.sed
Executable file
81
sql-to-dot.sed
Executable file
@@ -0,0 +1,81 @@
|
|||||||
|
#! /bin/sed -nf
|
||||||
|
1i\
|
||||||
|
/** @page database Database Schema\
|
||||||
|
\
|
||||||
|
@dot\
|
||||||
|
digraph schema {
|
||||||
|
|
||||||
|
# get everithing on one single line
|
||||||
|
H;$!d;$x
|
||||||
|
|
||||||
|
# remove all single-line comment lines
|
||||||
|
s/\n--[^\n]*//g
|
||||||
|
|
||||||
|
# reduce spaces
|
||||||
|
s,\t\| \+, ,g
|
||||||
|
|
||||||
|
# remove multiline comments
|
||||||
|
:f;s,\(.*\)/\*.*\*/[ \n]*;*,\1,g;tf
|
||||||
|
|
||||||
|
# remove empty lines
|
||||||
|
s,\n\+,\n,g
|
||||||
|
|
||||||
|
# remove unknown commands
|
||||||
|
s,\(;\|\n\) *\(DELIMITER\|USE\|DROP\|CREATE[ \n]\+DATABASE\)[ \n]\+[^;]*;\+,,ig
|
||||||
|
|
||||||
|
# convert special characters within quotes
|
||||||
|
:a;s/^\(\([^"]*"[^",]*"\)*[^"]*"[^"]*\),\([^"]*".*\)/\1\##COMMA##\3/g;ta
|
||||||
|
:c;s/^\(\([^']*'[^',]*'\)*[^']*'[^']*\),\([^']*'.*\)/\1\##COMMA##\3/g;tc
|
||||||
|
|
||||||
|
# backup everything to the buffer
|
||||||
|
# then analyze only on one create table
|
||||||
|
:i
|
||||||
|
h
|
||||||
|
s,.*\(create[ \n]\+table[^;]*;\).*,\1,ig
|
||||||
|
|
||||||
|
# start html table node
|
||||||
|
s|CREATE[ \n]\+TABLE[ \n]\+\(if[ \n]\+not[ \n]\+exists[ \n]\+\)\?`\?\(\w\+\)`\?| \2\n [shape=none, margin=0, label=<\n <table bgcolor="#dddddd">\n <tr><td bgcolor="#ddddff" colspan="4"><b>\2</b></td></tr>|ig
|
||||||
|
|
||||||
|
# remove key definitions
|
||||||
|
s/[),][\n ]*\(PRIMARY[ \n]\+\)\?KEY[ \n]\+[^(]*([^)]*)//gi
|
||||||
|
|
||||||
|
# move foreign keys as relation to the end
|
||||||
|
:b;s/\(\w\+\)\([^;]*\)FOREIGN[\n ]\+KEY[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*REFERENCES[ \n]*`\?\([a-z]\+\)`\?[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*\([^,)]*\)\([,)].*\)/\1\2\7\n \1:\3 -> \4:\5 [label="\6"]##SEMICOLON##/ig;tb
|
||||||
|
|
||||||
|
# create table rows
|
||||||
|
s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)[ \n]\+COMMENT[ \n]*["']\([^"']*\)["'][ \n]*|\n <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td><td align="left">\5</td></tr>|gi
|
||||||
|
s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)|\n <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td></tr>|g
|
||||||
|
|
||||||
|
# add line breaks for long lines
|
||||||
|
s|\(<td[^>]*>[^<]\{30,40\}\)[ \n]\+\([^<]\{20,\}</td>\)|\1<br/>\2|g
|
||||||
|
#:d;s|\(<br/>[^<]\{30,40\}\)[ \n]\+\([^<]\{20,\}</td>\)|\1<br/>\2|g;td
|
||||||
|
|
||||||
|
# add table comment below
|
||||||
|
:k;tk
|
||||||
|
s|[ \n]*)[^)]*COMMENT[ \n]*=[ \n]*["']\?\([^"']*\)["']\?[^;]*|\n <tr><td bgcolor="#ddddff" colspan="4">\1</td></tr>|ig;th
|
||||||
|
s|)[^);]*;|\n;|ig
|
||||||
|
:h
|
||||||
|
|
||||||
|
# cleanup comment below, add line breaksfor long lines
|
||||||
|
s|\(<td[^>]*>[^<]\{60,80\}\)[ \n]\+\([^<]\{30,\}</td>\)|\1<br/>\2|g
|
||||||
|
#:e;s|\(<br/>[^<]\{60,80\}\)[ \n]\+\([^<]\{30,\}</td>\)|\1<br/>\2|g;te
|
||||||
|
|
||||||
|
# close table
|
||||||
|
s|;|\n </table>\n >];|ig
|
||||||
|
|
||||||
|
# convert ##COMMA## to ,
|
||||||
|
s|##COMMA##|,|g
|
||||||
|
# convert ##SEMICOLON## to ;
|
||||||
|
s,##SEMICOLON##,;,g
|
||||||
|
|
||||||
|
# print one table
|
||||||
|
p
|
||||||
|
# get buffer back and remove the table that has just been analyzed
|
||||||
|
x
|
||||||
|
s,\(.*\)create[ \n]\+table[^;]*;\(.*\),\1\2,ig
|
||||||
|
ti
|
||||||
|
|
||||||
|
$a\
|
||||||
|
}\
|
||||||
|
@enddot\
|
||||||
|
*/
|
@@ -30,10 +30,10 @@ namespace NAMESPACE {
|
|||||||
return README;
|
return README;
|
||||||
}
|
}
|
||||||
std::string logo() {
|
std::string logo() {
|
||||||
return PROJECT_LOGO;
|
return PACKAGE_LOGO;
|
||||||
}
|
}
|
||||||
std::string icon() {
|
std::string icon() {
|
||||||
return PROJECT_ICON;
|
return PACKAGE_ICON;
|
||||||
}
|
}
|
||||||
const std::string WHAT("#(@) " PACKAGE_STRING);
|
const std::string WHAT("#(@) " PACKAGE_STRING);
|
||||||
const std::string IDENT("$Id: " PACKAGE_STRING);
|
const std::string IDENT("$Id: " PACKAGE_STRING);
|
||||||
|
@@ -1,16 +0,0 @@
|
|||||||
/*! @file
|
|
||||||
|
|
||||||
@id $Id$
|
|
||||||
*/
|
|
||||||
// 1 2 3 4 5 6 7 8
|
|
||||||
// 45678901234567890123456789012345678901234567890123456789012345678901234567890
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
namespace xml {
|
|
||||||
std::string version() {
|
|
||||||
return "@PACKAGE_NAME@-@PACKAGE_VERSION@";
|
|
||||||
}
|
|
||||||
const std::string WHAT("#(@) @PACKAGE_NAME@-@PACKAGE_VERSION@");
|
|
||||||
const std::string IDENT("$Id: @PACKAGE_NAME@-@PACKAGE_VERSION@ $");
|
|
||||||
}
|
|
Reference in New Issue
Block a user