Remove older CELT 0.9.0

mumble-voip · Jan 23, 2011 · c61522e · c61522e
1 parent 5fb3887
commit c61522e
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 19 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "celt-0.7.0-src"]
 	path = celt-0.7.0-src
 	url = git://git.xiph.org/celt.git/
-[submodule "celt-0.9.0-src"]
-	path = celt-0.9.0-src
-	url = git://git.xiph.org/celt.git/
 [submodule "celt-0.10.0-src"]
 	path = celt-0.10.0-src
 	url = git://git.xiph.org/celt.git/
diff --git a/installer/Files.wxs b/installer/Files.wxs
@@ -33,9 +33,6 @@
       <Component Id="celt0.0.7.0.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.7.0.dll" KeyPath="yes" />
       </Component>
-      <Component Id="celt0.0.9.0.dll">
-        <File Source="$(var.SourceDir)\release\celt0.0.9.0.dll" KeyPath="yes" />
-      </Component>
       <Component Id="celt0.0.10.0.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.10.0.dll" KeyPath="yes" />
       </Component>
@@ -105,9 +102,6 @@
       <Component Id="celt0.0.7.0.sse.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.7.0.sse.dll" KeyPath="yes" />
       </Component>
-      <Component Id="celt0.0.9.0.sse.dll">
-        <File Source="$(var.SourceDir)\release\celt0.0.9.0.sse.dll" KeyPath="yes" />
-      </Component>
       <Component Id="celt0.0.10.0.sse.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.10.0.sse.dll" KeyPath="yes" />
       </Component>
@@ -117,9 +111,6 @@
       <Component Id="celt0.0.7.0.sse2.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.7.0.sse2.dll" KeyPath="yes" />
       </Component>
-      <Component Id="celt0.0.9.0.sse2.dll">
-        <File Source="$(var.SourceDir)\release\celt0.0.9.0.sse2.dll" KeyPath="yes" />
-      </Component>
       <Component Id="celt0.0.10.0.sse2.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.10.0.sse2.dll" KeyPath="yes" />
       </Component>

diff --git a/installer/Product.wxs b/installer/Product.wxs
@@ -140,16 +140,13 @@
 
         <ComponentGroupRef Id="Plugins"/>
         <ComponentRef Id="celt0.0.7.0.dll" />
-        <ComponentRef Id="celt0.0.9.0.dll" />
         <ComponentRef Id="celt0.0.10.0.dll" />
         <?ifdef SSE ?>
         <ComponentRef Id="celt0.0.7.0.sse.dll" />
-        <ComponentRef Id="celt0.0.9.0.sse.dll" />
         <ComponentRef Id="celt0.0.10.0.sse.dll" />
         <?endif ?>
         <?ifdef SSE2 ?>
         <ComponentRef Id="celt0.0.7.0.sse2.dll" />
-        <ComponentRef Id="celt0.0.9.0.sse2.dll" />
         <ComponentRef Id="celt0.0.10.0.sse2.dll" />
         <?endif ?>
         <ComponentRef Id="mumble.exe" />

diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
@@ -243,7 +243,6 @@ def copy_codecs(self):
 		dst = os.path.join(self.bundle, 'Contents', 'Codecs')
 		os.makedirs(dst)
 		shutil.copy('release/libcelt0.0.7.0.dylib', dst)
-		shutil.copy('release/libcelt0.0.9.0.dylib', dst)
 		shutil.copy('release/libcelt0.0.10.0.dylib', dst)
 
 	def copy_plugins(self):
@@ -500,7 +499,6 @@ def create(self):
 			'release/Mumble.app/Contents/Plugins/liblink.dylib',
 			'release/Mumble.app/Contents/Plugins/libmanual.dylib',
 			'release/Mumble.app/Contents/Codecs/libcelt0.0.7.0.dylib',
-			'release/Mumble.app/Contents/Codecs/libcelt0.0.9.0.dylib',
 			'release/Mumble.app/Contents/Codecs/libcelt0.0.10.0.dylib',
 			# 1.1.x
 			'release/Mumble11x.app/',

diff --git a/main.pro b/main.pro
@@ -12,7 +12,7 @@ CONFIG *= ordered debug_and_release
     SUBDIRS *= speexbuild
   }
   !CONFIG(no-bundled-celt) {
-    SUBDIRS *= celt-0.7.0-build celt-0.9.0-build celt-0.10.0-build
+    SUBDIRS *= celt-0.7.0-build celt-0.10.0-build
   }
   !CONFIG(no-11x) {
     SUBDIRS *= src/mumble11x

diff --git a/scripts/release.pl b/scripts/release.pl
@@ -132,7 +132,7 @@ ($$)
 }
 
 my @fulldirs = ('speex','speex/include/speex','speex/libspeex','man');
-foreach my $cver ('0.7.0', '0.9.0', '0.10.0') {
+foreach my $cver ('0.7.0', '0.10.0') {
   push @fulldirs, "celt-$cver-src";
   push @fulldirs, "celt-$cver-src/libcelt";
 }