Changeset d4e90c1 in OpenSC

Timestamp:

06/15/11 07:58:37 (11 months ago)

Author:

martin

Branches:

master, staging

Children:

d505a55

Parents:

a6b7743

git-author:

Martin Paljak <martin@…> (06/07/11 09:28:25)

git-committer:

Martin Paljak <martin@…> (06/15/11 07:58:37)

Message:

Changes to build scripts requires for Git transition

Files:

• .gitignore (added)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• doc/Makefile.am (modified) (1 diff)
• doc/svn2cl.xsl (deleted)

Makefile.am

@@ -24 +24 @@
 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

configure.ac

@@ -6 +6 @@
 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])
@@ -193 +193 @@
 )
 
-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])
@@ -491 +491 @@
 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])

doc/Makefile.am

@@ -1 +1 @@
 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