Skip to content

Commit 56c1f29

Browse files
paulppaulp
committed
Good-bye, scala.dbc.
Another deprecated soul passes on to ether world.
1 parent 756dbbc commit 56c1f29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+6
-3631
lines changed

‎build.xml

-34
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,6 @@ QUICK BUILD (QUICK)
643643
<uptodate property="quick.lib.available" targetfile="${build-quick.dir}/library.complete">
644644
<srcfiles dir="${src.dir}">
645645
<include name="library/**"/>
646-
<include name="dbc/**"/>
647646
<include name="continuations/**"/>
648647
<include name="swing/**"/>
649648
<include name="actors/**"/>
@@ -689,15 +688,6 @@ QUICK BUILD (QUICK)
689688
<include name="**/*.scala"/>
690689
<compilationpath refid="quick.compilation.path"/>
691690
</scalacfork>
692-
<scalacfork
693-
destdir="${build-quick.dir}/classes/library"
694-
compilerpathref="locker.classpath"
695-
params="${scalac.args.quick}"
696-
srcdir="${src.dir}/dbc"
697-
jvmargs="${scalacfork.jvmargs}">
698-
<include name="**/*.scala"/>
699-
<compilationpath refid="quick.compilation.path"/>
700-
</scalacfork>
701691
<scalacfork
702692
destdir="${build-quick.dir}/classes/library"
703693
compilerpathref="locker.classpath"
@@ -1028,17 +1018,11 @@ PACKED QUICK BUILD (PACK)
10281018
</copy>
10291019
<jar destfile="${build-pack.dir}/lib/scala-library.jar">
10301020
<fileset dir="${build-quick.dir}/classes/library">
1031-
<exclude name="scala/dbc/**"/>
10321021
<exclude name="scala/swing/**"/>
10331022
<exclude name="scala/actors/**"/>
10341023
</fileset>
10351024
<zipfileset dirmode="755" filemode="644" src="${forkjoin.jar}"/>
10361025
</jar>
1037-
<jar destfile="${build-pack.dir}/lib/scala-dbc.jar">
1038-
<fileset dir="${build-quick.dir}/classes/library">
1039-
<include name="scala/dbc/**"/>
1040-
</fileset>
1041-
</jar>
10421026
<jar destfile="${build-pack.dir}/lib/scala-swing.jar">
10431027
<fileset dir="${build-quick.dir}/classes/library">
10441028
<include name="scala/swing/**"/>
@@ -1201,7 +1185,6 @@ BOOTSTRAPPING BUILD (STRAP)
12011185
<uptodate property="strap.lib.available" targetfile="${build-strap.dir}/library.complete">
12021186
<srcfiles dir="${src.dir}">
12031187
<include name="library/**"/>
1204-
<include name="dbc/**"/>
12051188
<include name="swing/**"/>
12061189
<include name="actors/**"/>
12071190
</srcfiles>
@@ -1246,15 +1229,6 @@ BOOTSTRAPPING BUILD (STRAP)
12461229
<include name="**/*.scala"/>
12471230
<compilationpath refid="strap.compilation.path"/>
12481231
</scalacfork>
1249-
<scalacfork
1250-
destdir="${build-strap.dir}/classes/library"
1251-
compilerpathref="pack.classpath"
1252-
params="${scalac.args.all}"
1253-
srcdir="${src.dir}/dbc"
1254-
jvmargs="${scalacfork.jvmargs}">
1255-
<include name="**/*.scala"/>
1256-
<compilationpath refid="strap.compilation.path"/>
1257-
</scalacfork>
12581232
<scalacfork
12591233
destdir="${build-strap.dir}/classes/library"
12601234
compilerpathref="pack.classpath"
@@ -1645,7 +1619,6 @@ DOCUMENTATION
16451619
<doc-uptodate-check name="library" srcdir="${src.dir}">
16461620
<source-includes>
16471621
<include name="library/**"/>
1648-
<include name="dbc/**"/>
16491622
<include name="swing/**"/>
16501623
<include name="actors/**"/>
16511624
</source-includes>
@@ -2033,9 +2006,6 @@ DISTRIBUTION
20332006
<fileset dir="${src.dir}/library"/>
20342007
<fileset dir="${src.dir}/continuations/library"/>
20352008
</jar>
2036-
<jar destfile="${dist.dir}/src/scala-dbc-src.jar">
2037-
<fileset dir="${src.dir}/dbc"/>
2038-
</jar>
20392009
<jar destfile="${dist.dir}/src/scala-swing-src.jar">
20402010
<fileset dir="${src.dir}/swing"/>
20412011
</jar>
@@ -2123,7 +2093,6 @@ STABLE REFERENCE (STARR)
21232093
<fileset dir="${basedir}/src/library"/>
21242094
<fileset dir="${basedir}/src/swing"/>
21252095
<fileset dir="${basedir}/src/actors"/>
2126-
<fileset dir="${basedir}/src/dbc"/>
21272096
</jar>
21282097
</target>
21292098

@@ -2225,9 +2194,6 @@ POSITIONS
22252194
<antcall target="test.positions.sub" inheritRefs="true">
22262195
<param name="test.srcs" value="${src.dir}/actors"/>
22272196
</antcall>
2228-
<antcall target="test.positions.sub" inheritRefs="true">
2229-
<param name="test.srcs" value="${src.dir}/dbc"/>
2230-
</antcall>
22312197
<antcall target="test.positions.sub" inheritRefs="true">
22322198
<param name="test.srcs" value="${src.dir}/swing"/>
22332199
</antcall>

‎docs/development/scala.dbc/SQLTypes.dot

-48
This file was deleted.

‎project/Build.scala

+5-7
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ object ScalaBuild extends Build with Layers {
7777
)
7878

7979
// Collections of projects to run 'compile' on.
80-
lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, dbc, forkjoin, fjbg)
80+
lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin, fjbg)
8181
// Collection of projects to 'package' and 'publish' together.
82-
lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, dbc, continuationsPlugin, jline, scalap)
82+
lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, continuationsPlugin, jline, scalap)
8383
lazy val partestRunProjects = Seq(testsuite, continuationsTestsuite)
8484

8585
private def epflPomExtra = (
@@ -249,7 +249,6 @@ object ScalaBuild extends Build with Layers {
249249
// TODO - Actors + swing separate jars...
250250
lazy val dependentProjectSettings = settingOverrides ++ Seq(quickScalaInstance, quickScalaLibraryDependency, addCheaterDependency("scala-library"))
251251
lazy val actors = Project("actors", file(".")) settings(dependentProjectSettings:_*) dependsOn(forkjoin % "provided")
252-
lazy val dbc = Project("dbc", file(".")) settings(dependentProjectSettings:_*)
253252
// TODO - Remove actors dependency from pom...
254253
lazy val swing = Project("swing", file(".")) settings(dependentProjectSettings:_*) dependsOn(actors % "provided")
255254
// This project will generate man pages (in man1 and html) for scala.
@@ -489,7 +488,7 @@ object ScalaBuild extends Build with Layers {
489488
genBin <<= genBinTask(genBinRunner, binDir, fullClasspath in Runtime, false),
490489
binDir in genBinQuick <<= baseDirectory apply (_ / "target" / "bin"),
491490
// Configure the classpath this way to avoid having .jar files and previous layers on the classpath.
492-
fullClasspath in Runtime in genBinQuick <<= Seq(quickComp,quickLib,scalap,actors,swing,dbc,fjbg,jline,forkjoin).map(classDirectory in Compile in _).join.map(Attributed.blankSeq),
491+
fullClasspath in Runtime in genBinQuick <<= Seq(quickComp,quickLib,scalap,actors,swing,fjbg,jline,forkjoin).map(classDirectory in Compile in _).join.map(Attributed.blankSeq),
493492
fullClasspath in Runtime in genBinQuick <++= (fullClasspath in Compile in jline),
494493
genBinQuick <<= genBinTask(genBinRunner, binDir in genBinQuick, fullClasspath in Runtime in genBinQuick, true),
495494
runManmakerMan <<= runManmakerTask(fullClasspath in Runtime in manmaker, runner in manmaker, "scala.tools.docutil.EmitManPage", "man1", ".1"),
@@ -518,10 +517,9 @@ object ScalaBuild extends Build with Layers {
518517
},
519518
// Add in some more dependencies
520519
makeDistMappings <<= (makeDistMappings,
521-
packageBin in swing in Compile,
522-
packageBin in dbc in Compile) map {
520+
packageBin in swing in Compile) map {
523521
(dist, s, d) =>
524-
dist ++ Seq(s -> "lib/scala-swing.jar", d -> "lib/scala-dbc.jar")
522+
dist ++ Seq(s -> "lib/scala-swing.jar")
525523
},
526524
makeDist <<= (makeDistMappings, baseDirectory, streams) map { (maps, dir, s) =>
527525
s.log.debug("Map = " + maps.mkString("\n"))

‎src/build/maven/maven-deploy.xml

-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
<deploy-local name="scala-compiler" version="@{version}" repository="@{repository}" />
113113
<deploy-local-plugin name="continuations" version="@{version}" repository="@{repository}"/>
114114
<deploy-local name="scala-actors" version="@{version}" repository="@{repository}" />
115-
<deploy-local name="scala-dbc" version="@{version}" repository="@{repository}" />
116115
<deploy-local name="scala-swing" version="@{version}" repository="@{repository}"/>
117116
<deploy-local name="scalap" version="@{version}" repository="@{repository}"/>
118117
<deploy-local name="scala-partest" version="@{version}" repository="@{repository}"/>
@@ -171,7 +170,6 @@
171170
</deploy-remote>
172171
<deploy-remote name="jline" version="@{version}" repository="@{repository}"/>
173172
<deploy-remote name="scala-compiler" version="@{version}" repository="@{repository}" />
174-
<deploy-remote name="scala-dbc" version="@{version}" repository="@{repository}" />
175173
<deploy-remote name="scala-swing" version="@{version}" repository="@{repository}"/>
176174
<deploy-remote name="scala-actors" version="@{version}" repository="@{repository}"/>
177175
<deploy-remote name="scalap" version="@{version}" repository="@{repository}"/>
@@ -239,7 +237,6 @@
239237
<deploy-remote-signed name="scala-library" version="@{version}" repository="@{repository}"/>
240238
<deploy-remote-signed name="jline" version="@{version}" repository="@{repository}"/>
241239
<deploy-remote-signed name="scala-compiler" version="@{version}" repository="@{repository}" />
242-
<deploy-remote-signed name="scala-dbc" version="@{version}" repository="@{repository}" />
243240
<deploy-remote-signed name="scala-swing" version="@{version}" repository="@{repository}"/>
244241
<deploy-remote-signed name="scala-actors" version="@{version}" repository="@{repository}"/>
245242
<deploy-remote-signed name="scalap" version="@{version}" repository="@{repository}"/>

‎src/build/maven/scala-dbc-pom.xml

-61
This file was deleted.

‎src/build/pack.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ MAIN DISTRIBUTION PACKAGING
137137
<mvn-copy-lib mvn.artifact.name="jline"/>
138138
<mvn-copy-lib mvn.artifact.name="scala-library"/>
139139
<mvn-copy-lib mvn.artifact.name="scala-compiler"/>
140-
<mvn-copy-lib mvn.artifact.name="scala-dbc"/>
141140
<mvn-copy-lib mvn.artifact.name="scala-swing"/>
142141
<mvn-copy-lib mvn.artifact.name="scala-actors"/>
143142
<mvn-copy-lib mvn.artifact.name="scala-partest"/>
@@ -202,11 +201,9 @@ MAIN DISTRIBUTION PACKAGING
202201
basedir="${build-docs.dir}/continuations-plugin">
203202
<include name="**/*"/>
204203
</jar>
205-
<!-- TODO - Scala swing, dbc and actors should maybe have thier own jar, but creating it is SLOW. -->
204+
<!-- TODO - Scala swing and actors should maybe have thier own jar, but creating it is SLOW. -->
206205
<copy tofile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar"
207206
file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
208-
<copy tofile="${dists.dir}/maven/${version.number}/scala-dbc/scala-dbc-docs.jar"
209-
file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
210207
<copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar"
211208
file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
212209
</target>

‎src/dbc/scala/dbc/DataType.scala

-69
This file was deleted.

0 commit comments

Comments
 (0)