[Jpackage-commits] dist/scala28/devel .cvsignore, 1.1, 1.2 scala-2.8.0-tooltemplate.patch, NONE, 1.1 scala-2.8.1-use_system_jline.patch, NONE, 1.1 scala-mime-info.xml, NONE, 1.1 scala.ant.d, NONE, 1.1 scala.keys, NONE, 1.1 scala.mime, NONE, 1.1 scala28.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed Oct 12 21:17:03 CEST 2011


Update of /home/projects/jpackage/cvs/dist/scala28/devel
In directory ryu.zarb.org:/tmp/cvs-serv2841/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scala-2.8.0-tooltemplate.patch 
	scala-2.8.1-use_system_jline.patch scala-mime-info.xml 
	scala.ant.d scala.keys scala.mime scala28.spec 
Log Message:
Import scala28 into devel

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/scala28/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	12 Oct 2011 18:57:47 -0000	1.1
--- .cvsignore	12 Oct 2011 19:17:00 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ scala-2.8.1.final-sources.tgz

--- NEW FILE: scala.mime ---
text/x-scala
	ext: scala

--- NEW FILE: scala-2.8.1-use_system_jline.patch ---
diff -up scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala.systemjline scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala
--- scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala.systemjline	2010-10-13 22:03:52.000000000 +0200
+++ scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/Completion.scala	2010-12-09 18:59:26.431432002 +0100
@@ -309,7 +309,8 @@ class Completion(val repl: Interpreter) 
       else xs.reduceLeft(_ zip _ takeWhile (x => x._1 == x._2) map (_._1) mkString)
 
     // This is jline's entry point for completion.
-    override def complete(_buf: String, cursor: Int, candidates: JList[String]): Int = {
+    override def complete(_buf: String, cursor: Int, _candidates: JList[_]): Int = {
+      val candidates = _candidates.asInstanceOf[JList[String]]
       val buf = onull(_buf)
       verbosity = if (isConsecutiveTabs(buf, cursor)) verbosity + 1 else 0
       DBG("\ncomplete(%s, %d) last = (%s, %d), verbosity: %s".format(buf, cursor, lastBuf, lastCursor, verbosity))
diff -up scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala.systemjline scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala
--- scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala.systemjline	2010-10-13 22:03:52.000000000 +0200
+++ scala-2.8.1.final-sources/src/compiler/scala/tools/nsc/interpreter/History.scala	2010-12-09 18:52:12.258432001 +0100
@@ -14,7 +14,7 @@ import Properties.userHome
 /** Primarily, a wrapper for JLine's History.
  */
 class History(val jhistory: JHistory) {
-  def asJavaList = jhistory.getHistoryList
+  def asJavaList = jhistory.getHistoryList.asInstanceOf[java.util.List[String]]
   def asList: List[String] = asBuffer(asJavaList).toList
   def index = jhistory.getCurrentIndex
 

--- NEW FILE: scala-2.8.0-tooltemplate.patch ---
diff -up scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl.tooltemplate scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
--- scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl.tooltemplate	2010-08-15 02:18:09.365756959 -0600
+++ scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl	2010-08-15 02:21:16.517801279 -0600
@@ -8,35 +8,13 @@
 # PARTICULAR PURPOSE.
 ##############################################################################
 
-cygwin=false;
-case "`uname`" in
-    CYGWIN*) cygwin=true ;;
-esac
-
-# Finding the root folder for this Scala distribution
-SOURCE=$0;
-SCRIPT=`basename "$SOURCE"`;
-while [ -h "$SOURCE" ]; do
-    SCRIPT=`basename "$SOURCE"`;
-    LOOKUP=`ls -ld "$SOURCE"`;
-    TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`;
-    if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then
-        SOURCE=${TARGET:-.};
-    else
-        SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
-    fi;
-done;
-
-# see #2092
-SCALA_HOME=`dirname "$SOURCE"`
-SCALA_HOME=`cd "$SCALA_HOME"; pwd -P`
-SCALA_HOME=`cd "$SCALA_HOME"/..; pwd`
-
-# Remove spaces from SCALA_HOME on windows
-if $cygwin; then
-    SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"`
-    SCALA_HOME=`cygpath --unix "$SCALA_HOME"`
-fi
+[ -r @@JAVADIR@@-utils/java-functions ] && . @@JAVADIR@@-utils/java-functions || exit 1
+
+set_javacmd || exit 3
+check_java_env || exit 4
+set_jvm_dirs || exit 5
+
+SCALA_HOME="@@DATADIR@@/scala"
 
 # Constructing the extension classpath
 TOOL_CLASSPATH="@classpath@"
@@ -50,16 +28,6 @@ if [ -z "$TOOL_CLASSPATH" ] ; then
     done
 fi
 
-if $cygwin; then
-    if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
-        format=mixed
-    else
-        format=windows
-    fi
-    SCALA_HOME=`cygpath --$format "$SCALA_HOME"`
-    TOOL_CLASSPATH=`cygpath --path --$format "$TOOL_CLASSPATH"`
-fi
-
 # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris
 [ -n "$JAVA_OPTS" ] || JAVA_OPTS="@javaflags@"
 
@@ -75,9 +43,4 @@ do
   esac
 done 
 
-
-if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
-    JAVACMD="$JAVA_HOME/bin/java"
-fi
-
-exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@"
+exec "${JAVACMD}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@"

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/scala28/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	12 Oct 2011 18:57:47 -0000	1.1
--- sources	12 Oct 2011 19:17:00 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 6a6cd9dbbabf74d9d43f69e5328671e9  scala-2.8.1.final-sources.tgz

--- NEW FILE: scala.ant.d ---
scala

--- NEW FILE: scala-mime-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="text/x-scala">
    <sub-class-of type="text/plain"/>
    <comment>Scala source code</comment>
    <glob pattern="*.scala" />
  </mime-type>
</mime-info>

--- NEW FILE: scala28.spec ---
Name:           scala28
Version:        2.8.1
%define fullversion %{version}.final
%define oname   scala
Release:        2%{?dist}
Summary:        A hybrid functional/object-oriented language for the JVM
BuildArch:      noarch
Group:          Development/Languages
# License was confirmed to be standard BSD by fedora-legal
# https://www.redhat.com/archives/fedora-legal-list/2007-December/msg00012.html
License:        BSD
URL:            http://www.scala-lang.org/

# Source
Source0:        http://www.scala-lang.org/downloads/distrib/files/scala-%{fullversion}-sources.tgz

Source21:       scala.keys
Source22:       scala.mime
Source23:       scala-mime-info.xml
Source24:       scala.ant.d

Patch1:         scala-2.8.1-use_system_jline.patch
Patch2:         scala-2.8.0-tooltemplate.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define jline_jar /usr/share/java/jline.jar

# Force build with openjdk/icedtea because gij is horribly slow and I haven't
# been successful at integrating aot compilation with the build process
BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:  ant
BuildRequires:  ant-contrib
BuildRequires:  ant-nodeps
BuildRequires:  jline
BuildRequires:  jpackage-utils
#BuildRequires:  shtool
Requires:       java >= 0:1.6.0
Requires:       jline
Requires:       jpackage-utils
Requires:       %{jline_jar}

%description
Scala is a general purpose programming language designed to express common
programming patterns in a concise, elegant, and type-safe way. It smoothly
integrates features of object-oriented and functional languages. It is also
fully interoperable with Java.

%package apidoc
Summary:        Documentation for the Scala programming language
Group:          Documentation

%description apidoc
Scala is a general purpose programming language for the JVM that blends
object-oriented and functional programming. This package provides
reference and API documentation for the Scala programming language.

%package -n ant-scala28
Summary:        Development files for Scala
Group:          Development/Languages
Requires:       scala = %{version}-%{release}, ant

%description -n ant-scala28
Scala is a general purpose programming language for the JVM that blends
object-oriented and functional programming. This package enables support for
the scala ant tasks.

%package examples
Summary:        Examples for the Scala programming language
Group:          Development/Languages
# Otherwise it will pick up some perl module
Autoprov:       0
Requires:       scala = %{version}-%{release}

%description examples
Scala is a general purpose programming language for the JVM that blends
object-oriented and functional programming. This package contains examples for
the Scala programming language

%define scaladir %{_datadir}/scala28

%prep
%setup -q -n scala-%{fullversion}-sources
%patch1 -p1 -b .systemjline
%patch2 -p1 -b .tooltemplate

# remove all jar files except scala-library and scala-compiler needed
# for bootstrap
find . -not \( -name 'scala-library.jar' -or -name 'scala-compiler.jar' -or -name 'msil.jar' -or -name 'fjbg.jar' -or -name 'forkjoin.jar' \) -and -name '*.jar' | xargs rm -f
find . -name '*.dll' -or -name '*.so' -or -name '*.exe' | xargs rm -f

##
# Copy system jline over bundled library
##

#rap#ln -s %{jline_jar} lib/jline.jar

%build
# Scala is written in itself and therefore requires boot-strapping from an
# initial binary build. The dist target of the ant build is a staged build
# that makes sure that the package bootstraps properly. The bundled binary
# compiler is used to compile the source code. That binary is used to 
# compile the source code again. That binary is used to compile the code
# again and the output is checked that it is exactly the same.  This makes
# sure that the build is repeatable and that the bootstrap compiler could
# be replaced with this one and successfully build the whole distribution
# again

##
# Rebuild Bundled jline
##

#(
#  cd src/jline
#  mkdir -p .m2/repository
#  mvn-jpp -Dmaven.repo.local=$PWD/.m2/repository package
#  cp target/jline-0.9.95-SNAPSHOT.jar ../../lib/jline.jar
#)

export OPT_JAR_LIST="ant-contrib ant/ant-nodeps"
export CLASSPATH=$(build-classpath ant)
# rebuild internal libraries and bootstrap compiler
%ant \
     -Dant.jar=$(build-classpath ant) \
     -Djline.jar=$(build-classpath jline) \
     -Dversion.number=%{fullversion} -Djava6.home=%{_jvmdir}/java-1.6.0 newlibs newforkjoin locker.clean pack.done starr.done locker.clean || exit 1

# build distribution with newly built compiler
%ant \
     -Dant.jar=$(build-classpath ant) \
     -Djline.jar=$(build-classpath jline) \
     -Dversion.number=%{fullversion} newlibs libs.clean locker.clean docs.clean dist.done || exit 1

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_bindir}
for oprog in scaladoc fsc scala scalac scalap; do
        prog=${oprog}28
        install -p -m 755 dists/scala-%{fullversion}/bin/$oprog $RPM_BUILD_ROOT%{_bindir}/$prog
        install -p -m 644 dists/scala-%{fullversion}/man/man1/$oprog.1 $RPM_BUILD_ROOT%{_mandir}/man1/$prog.1
done

install -p -m 755 -d $RPM_BUILD_ROOT%{_javadir}/scala28
install -p -m 755 -d $RPM_BUILD_ROOT%{scaladir}/lib
for olibname in scala-compiler scala-dbc scala-library scala-partest scala-swing scalap ; do
        libname=$(echo $olibname | sed -e 's/scala/scala28/')
        install -m 644 dists/scala-%{fullversion}/lib/$olibname.jar $RPM_BUILD_ROOT%{_javadir}/scala28/$libname-%{fullversion}.jar
        ln -s $libname-%{fullversion}.jar $RPM_BUILD_ROOT%{_javadir}/scala28/$libname.jar
        ln -s %{_javadir}/scala28/$libname.jar $RPM_BUILD_ROOT%{scaladir}/lib
done
ln -s  %{_javadir}/jline.jar $RPM_BUILD_ROOT%{scaladir}/lib

install -d $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
install -p -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/scala28

cp -pr dists/scala-%{fullversion}/doc/scala-devel-docs/examples $RPM_BUILD_ROOT%{_datadir}/scala28/

install -d $RPM_BUILD_ROOT%{_datadir}/mime-info
install -p -m 644 %{SOURCE21} %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/mime-info/

install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages/
install -p -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_datadir}/mime/packages/

sed -i -e 's, at JAVADIR@,%{_javadir},g' -e 's, at DATADIR@,%{_datadir},g' $RPM_BUILD_ROOT%{_bindir}/*

%post
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_javadir}/scala28
%dir %{_datadir}/scala28
%{_datadir}/scala28/lib
%{_mandir}/man1/*
%doc dists/scala-%{fullversion}/doc/LICENSE
%doc dists/scala-%{fullversion}/doc/README
%{_datadir}/mime-info/*
%{_datadir}/mime/packages/*

%files -n ant-scala28
%defattr(-,root,root,-)
# Following is plain config because the ant task classpath could change from
# release to release
%config %{_sysconfdir}/ant.d/*

%files apidoc
%defattr(-,root,root,-)
%doc dists/scala-%{fullversion}/doc/scala-devel-docs/api
%doc dists/scala-%{fullversion}/doc/LICENSE

%files examples
%defattr(-,root,root,-)
%{_datadir}/scala28/examples

%changelog
* Wed Oct 12 2011 Ralph Apel <r.apel r-apel de> - 2.8.1-2
- Make it distribution neutral, JPP style, named scala28

* Thu Dec  9 2010 Jochen Schmitt <Jochen herr-schmitt de> - 2.8.1-1
- New upstream release (#661853)

* Sun Aug 15 2010 Geoff Reedy <geoff at programmer-monk.net> - 2.8.0-1
- Update to upstream 2.8.0 release

* Thu Oct 29 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.7-1
- Update to upstream 2.7.7 release

* Sat Sep 19 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.5-1
- Update to upstream 2.7.5 release

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-5
- fix problem in tooltemplate patch

* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-4
- make jline implicitly available to match upstream behavior

* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-3
- fix problem with substitutions to scripts in %%install

* Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-2
- fix launcher scripts by modifying template, not overriding them

* Tue May 12 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-1
- update to 2.7.4 final

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
- update to 2.7.3 final

* Sun Nov 09 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-1
- update to 2.7.2 final

* Mon Nov 03 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.3.RC6
- bump release to fix upgrade path

* Thu Nov 01 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.1.RC6
- update to 2.7.2-RC6

* Thu Oct 30 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.1.RC5
- update to 2.7.2-RC5

* Sat Sep 06 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.2.RC1
- All code is now under BSD license
- Remove dll so and exe binaries in prep
- Add BuildRequires required by Java packaging guidelines
- Add missing defattr for examples and ant-scala

* Wed Aug 20 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-0.1.RC1
- update to 2.7.2-RC1

* Wed Aug 13 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.1-3
- regenerate classpath in manifest patch to apply cleanly to 2.7.1

* Wed Aug 13 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.1-2
- no changes, accidental release bump

* Mon May 05 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.1-1
- Update to 2.7.1

* Fri May 02 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.0-2
- Use java-sdk-openjdk for non-fc8 builds

* Mon Mar 10 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.0-1
- Update to 2.7.0
- License now correctly indicated as BSD and LGPLv2+
- Include LICENSE file in apidoc subpackage

* Mon Feb 11 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-8
- Adhere more strongly to the emacs package guidelines
- Include some comments regarding the boot-strapping process

* Wed Jan 16 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-7
- Add dist tag to release
- Fix directory ownership issues in %%_datadir/scala
- Remove source code from -devel package
- Rename -devel package to ant-scala
- Fix packaging of gtksourceview2 language spec
- Preserve timestamps when installing and cping
- Add patch to remove Class-Path entries from jar manifests
- Fix line endings in enscript/README
 
* Sun Jan 13 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-6
- Include further information about inclusion of binary distribution
- Unpack only those files needed from the binary distribution
- Include note about license approval

* Thu Dec 27 2007 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-5
- Add emacs(bin) BR
- Patch out call to subversion in build.xml
- Add pkgconfig to BuildRequires

* Thu Dec 27 2007 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-4
- Reformat emacs-scala description
- Expand tabs to spaces
- Fix -devel symlinks
- Better base package summary

* Wed Dec 26 2007 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-3
- Add ant config to devel package
- Require icedtea for build
- Move examples to %%{_datadir}/scala/examples
- Clean up package descriptions
- Add base package requirement for scala-examples and scala-devel

* Wed Dec 26 2007 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-2
- Fix post scripts
- Use spaces instead of tabs

* Wed Dec 26 2007 Geoff Reedy <geoff at programmer-monk.net> - 2.6.1-1
- Initial build.

--- NEW FILE: scala.keys ---
text/x-scala
	description=Scala source code
	category=Software Development/Source Code
	can_be_executable=TRUE




More information about the JPackage-commits mailing list