OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   08-Feb-2008 19:39:24
  Branch: HEAD                             Handle: 2008020818392200

  Added files:
    openpkg-src/antlr       antlr.sh antlrworks.sh
  Modified files:
    openpkg-src/antlr       antlr.spec
  Removed files:
    openpkg-src/antlr       antlr.mk

  Log:
    upgrading package: antlr 2.7.7 -> 3.0.1

  Summary:
    Revision    Changes     Path
    1.2         +0  -212    openpkg-src/antlr/antlr.mk
    1.1         +18 -0      openpkg-src/antlr/antlr.sh
    1.8         +29 -41     openpkg-src/antlr/antlr.spec
    1.1         +10 -0      openpkg-src/antlr/antlrworks.sh
  ____________________________________________________________________________

  rm -f openpkg-src/antlr/antlr.mk <<'@@ .'
  Index: openpkg-src/antlr/antlr.mk
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/antlr/antlr.sh
  ============================================================================
  $ cvs diff -u -r0 -r1.1 antlr.sh
  --- /dev/null 2008-02-08 19:34:58 +0100
  +++ antlr.sh  2008-02-08 19:39:23 +0100
  @@ -0,0 +1,18 @@
  +#!/bin/sh
  +##
  +##  antlr.sh -- ANTLR startup wrapper script
  +##
  +
  +cp=""
  +for jar in \
  +    @l_prefix@/libexec/antlr/antlr-3.*.jar \
  +    @l_prefix@/libexec/antlr/stringtemplate-*.jar \
  +    @l_prefix@/libexec/antlr/antlr-2.*jar; do
  +    if [ ".$cp" = . ]; then cp="$jar"; else cp="$cp:$jar"; fi
  +done
  [EMAIL PROTECTED]@/bin/java \
  +   -Vsun-jdk \
  +   -cp "$cp" \
  +   org.antlr.Tool \
  +   ${1+"$@"}
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/antlr/antlr.spec
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 antlr.spec
  --- openpkg-src/antlr/antlr.spec      1 Jan 2008 14:50:30 -0000       1.7
  +++ openpkg-src/antlr/antlr.spec      8 Feb 2008 18:39:22 -0000       1.8
  @@ -21,9 +21,13 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package version
  +%define       V_antlr          3.0.1
  +%define       V_antlrworks     1.1.7
  +
   #   package information
   Name:         antlr
  -Summary:      ANother Tool for Language Recognition
  +Summary:      ANother Tool for Language Recognition (ANTLR)
   URL:          http://www.antlr.org/
   Vendor:       Terence Parr
   Packager:     OpenPKG Foundation e.V.
  @@ -31,80 +35,64 @@
   Class:        EVAL
   Group:        CompilerCompiler
   License:      GPL
  -Version:      2.7.7
  -Release:      20080101
  +Version:      %{V_antlr}
  +Release:      20080208
   
   #   list of sources
  -Source0:      http://www.antlr.org/download/antlr-%{version}.tar.gz
  -Source1:      antlr.mk
  +Source0:      http://www.antlr.org/download/antlr-%{V_antlr}.tar.gz
  +Source1:      http://www.antlr.org/download/antlrworks-%{V_antlrworks}.jar
  +Source2:      antlr.sh
  +Source3:      antlrworks.sh
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes, 
gcc::with_java = yes, make
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20040130
  +PreReq:       OpenPKG, openpkg >= 20040130, java, JAVA-JDK
   AutoReq:      no
   AutoReqProv:  no
   
   %description
  -    ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
  +    ANother Tool for Language Recognition (ANTLR, formerly PCCTS)
       is a language tool that provides a framework for constructing
       recognizers, compilers, and translators from grammatical
       descriptions containing Java, C#, Python, or C++ actions. ANTLR
       is popular because it is easy to understand, powerful, flexible,
       generates human-readable output, and comes with complete source.
       ANTLR provides excellent support for tree construction, tree
  -    walking, and translation. This packaging contains a GCJ compiled
  -    ANTLR executable and mainly supports C++ grammar actions.
  +    walking, and translation.
   
   %track
       prog antlr = {
  -        comment   = "thl: 3.x build process changed significantly. Needs 
complete overhaul"
  -        version   = %{version}
  +        version   = %{V_antlr}
           url       = http://www.antlr.org/download/
           regex     = antlr-(__VER__)\.tar\.gz
       }
  +    prog antlr:antrlworks = {
  +        version   = %{V_antlrworks}
  +        url       = http://www.antlr.org/download/
  +        regex     = antlrworks-(__VER__)\.jar
  +    }
   
   %prep
       %setup -q
   
   %build
  -    CC="%{l_cc}" \
  -    CXX="%{l_cxx}" \
  -    CFLAGS="%{l_cflags -O}" \
  -    CXXFLAGS="%{l_cxxflags -O}" \
  -    CPPFLAGS="%{l_cppflags}" \
  -    ./configure \
  -        --prefix=%{l_prefix} \
  -        --includedir=%{l_prefix}/include/antlr \
  -        --enable-cxx \
  -        --disable-java \
  -        --disable-python \
  -        --disable-csharp
  -    %{l_make} %{l_mflags}
  -    %{l_make} %{l_mflags} -f %{SOURCE antlr.mk}
   
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib \
  -        $RPM_BUILD_ROOT%{l_prefix}/include/antlr \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/antlr
  -    %{l_shtool} install -c -s -m 755 \
  -        antlr/antlr $RPM_BUILD_ROOT%{l_prefix}/bin/
  -    %{l_shtool} install -c -m 755 \
  -        scripts/antlr-config $RPM_BUILD_ROOT%{l_prefix}/bin/
  -    %{l_shtool} install -c -m 644 \
  -        lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{l_prefix}/lib/
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/antlr
       %{l_shtool} install -c -m 644 \
  -        lib/cpp/antlr/* $RPM_BUILD_ROOT%{l_prefix}/include/antlr/
  +        lib/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/antlr/
       %{l_shtool} install -c -m 644 \
  -        doc/*.html doc/*.gif doc/*.jpg \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/antlr/
  -    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  -        %{l_files_std} \
  -        '%doc %{l_prefix}/share/antlr/*'
  +        %{SOURCE1} $RPM_BUILD_ROOT%{l_prefix}/libexec/antlr/
  +    %{l_shtool} install -c -m 755 %{l_value -s -a} \
  +        %{SOURCE antlr.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/antlr
  +    %{l_shtool} install -c -m 755 %{l_value -s -a} \
  +        %{SOURCE antlrworks.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/antlrworks
  +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/antlr/antlrworks.sh
  ============================================================================
  $ cvs diff -u -r0 -r1.1 antlrworks.sh
  --- /dev/null 2008-02-08 19:34:58 +0100
  +++ antlrworks.sh     2008-02-08 19:39:23 +0100
  @@ -0,0 +1,10 @@
  +#!/bin/sh
  +##
  +##  antlrworks.sh -- ANTLRWorks startup wrapper script
  +##
  +
  [EMAIL PROTECTED]@/bin/java \
  +   -Vsun-jdk \
  +   -jar @l_prefix@/libexec/antlr/antlrworks-*.jar \
  +   ${1+"$@"}
  +
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to