Permalink
Browse files

Changes to build scripts requires for Git transition

  • Loading branch information...
1 parent a6b7743 commit d4e90c171a77bc58c4c9a5665fd3ddc8ec35004e @martinpaljak martinpaljak committed Jun 7, 2011
Showing with 87 additions and 309 deletions.
  1. +76 −0 .gitignore
  2. +5 −8 Makefile.am
  3. +5 −5 configure.ac
  4. +1 −1 doc/Makefile.am
  5. +0 −295 doc/svn2cl.xsl
View
@@ -0,0 +1,76 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+lt*.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+.deps
+.libs
+.#*#
+.*.bak
+.*.orig
+.*.rej
+.*~
+#*#
+*.bak
+*.d
+*.def
+*.dll
+*.exe
+*.la
+*.lib
+*.lo
+*.orig
+*.pdb
+*.rej
+*.u
+*.rc
+*.pc
+*~
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+*.tmp
+ChangeLog
+opensc.conf
+xsl-stylesheets
+opensc-config
+test-conf
+pkcs15-tool
+pkcs15-crypt
+pkcs15-init
+piv-tool
+eidenv
+opensc-explorer
+opensc-tool
+rutoken-tool
+cardos-info
+cryptoflex-tool
+netkey-tool
+pkcs11-tool
+pintest
+p15dump
+prngtest
+base64
+lottery
View
@@ -23,15 +23,12 @@ dist_doc_DATA = NEWS
Generate-ChangeLog:
rm -f ChangeLog.tmp "$(srcdir)/ChangeLog"
- test -n "$(SVN)" -a -n "$(XSLTPROC)"
- if test -d "$(top_srcdir)/.svn"; then \
- $(SVN) --verbose --xml log "$(top_srcdir)" | \
- $(XSLTPROC) --nonet --stringparam linelen 75 \
- --stringparam groupbyday no \
- --stringparam include-rev no \
- "$(top_srcdir)/doc/svn2cl.xsl" - > ChangeLog.tmp; \
+ test -n "$(GIT)"
+ if test -d "$(top_srcdir)/.git"; then \
+ echo "# Generated by Makefile. Do not edit!" > ChangeLog.tmp; \
+ $(GIT) log >> ChangeLog.tmp; \
else \
- echo "Warning: Unable to generate ChangeLog from none svn checkout" >&2; \
+ echo "Warning: Unable to generate ChangeLog. Need a Git repostiroy." >&2; \
echo > ChangeLog.tmp; \
fi
mv ChangeLog.tmp "$(srcdir)/ChangeLog"
View
@@ -5,7 +5,7 @@ AC_PREREQ(2.60)
define([PACKAGE_VERSION_MAJOR], [0])
define([PACKAGE_VERSION_MINOR], [12])
define([PACKAGE_VERSION_FIX], [2])
-define([PACKAGE_SUFFIX], [-svn])
+define([PACKAGE_SUFFIX], [-pre1])
AC_INIT([opensc],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX])
AC_CONFIG_AUX_DIR([.])
@@ -192,11 +192,11 @@ ifdef(
]
)
-dnl These required for svn checkout
-AC_ARG_VAR([SVN], [subversion utility])
+dnl These required for repository checkout
AC_ARG_VAR([XSLTPROC], [xsltproc utility])
-AC_CHECK_PROGS([SVN],[svn])
+AC_ARG_VAR([git], [git])
AC_CHECK_PROGS([XSLTPROC],[xsltproc])
+AC_CHECK_PROGS([GIT],[git])
AC_MSG_CHECKING([xsl-stylesheets])
if test "${xslstylesheetsdir}" = "detect"; then
@@ -490,7 +490,7 @@ fi
if test "${enable_man}" = "yes" -o "${enable_doc}" = "yes"; then
AC_MSG_CHECKING([XSLTPROC requirement])
- test -n "${XSLTPROC}" || AC_MSG_ERROR([Missing XSLTPROC svn build with man or doc])
+ test -n "${XSLTPROC}" || AC_MSG_ERROR([Missing XSLTPROC])
test "${xslstylesheetsdir}" != "no" || AC_MSG_ERROR([Missing xslstylesheetsdir])
AC_MSG_RESULT([ok])
fi
View
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-dist_noinst_SCRIPTS = svn2cl.xsl html.xsl man.xsl
+dist_noinst_SCRIPTS = html.xsl man.xsl
dist_noinst_DATA = $(srcdir)/tools/*.xml api.css
if ENABLE_DOC
html_DATA = html.out/*
Oops, something went wrong.

0 comments on commit d4e90c1

Please sign in to comment.