mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 09:45:39 +02:00
Code Issues Wiki Activity

Some fixes for zip compression.

Browse source
This commit is contained in:
Doug Schaefer 2008-12-19 20:32:33 +00:00
parent e3a1eeca7a
commit d735f36b31
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java
View file

@ -83,7 +83,7 @@ public class MinGWGenerator implements IApplication {
IInstallableUnit runtimeIU = createIU(runtimeIUDesc, runtimeId, runtimeVersion, IInstallableUnit runtimeIU = createIU(runtimeIUDesc, runtimeId, runtimeVersion,
"http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32.tar.gz", "http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32.tar.gz",
mingwSubdir, mingwSubdir,
InstallArtifactRepository.GZIP_COMPRESSON); InstallArtifactRepository.GZIP_COMPRESSION);
// w32api // w32api
String w32apiId = "wascana.mingw.w32api"; String w32apiId = "wascana.mingw.w32api";
@ -92,7 +92,7 @@ public class MinGWGenerator implements IApplication {
IInstallableUnit w32apiIU = createIU(w32apiIUDesc, w32apiId, w32apiVersion, IInstallableUnit w32apiIU = createIU(w32apiIUDesc, w32apiId, w32apiVersion,
"http://downloads.sourceforge.net/mingw/w32api-3.13-mingw32-dev.tar.gz", "http://downloads.sourceforge.net/mingw/w32api-3.13-mingw32-dev.tar.gz",
mingwSubdir, mingwSubdir,
InstallArtifactRepository.GZIP_COMPRESSON); InstallArtifactRepository.GZIP_COMPRESSION);
// binutils // binutils
String binutilsId = "wascana.mingw.binutils"; String binutilsId = "wascana.mingw.binutils";
@ -101,7 +101,7 @@ public class MinGWGenerator implements IApplication {
IInstallableUnit binutilsIU = createIU(binutilsIUDesc, binutilsId, binutilsVersion, IInstallableUnit binutilsIU = createIU(binutilsIUDesc, binutilsId, binutilsVersion,
"http://downloads.sourceforge.net/mingw/binutils-2.19-mingw32-bin.tar.gz", "http://downloads.sourceforge.net/mingw/binutils-2.19-mingw32-bin.tar.gz",
mingwSubdir, mingwSubdir,
InstallArtifactRepository.GZIP_COMPRESSON); InstallArtifactRepository.GZIP_COMPRESSION);
// gcc-4 core // gcc-4 core
String gcc4coreId = "wascana.mingw.gcc4.core"; String gcc4coreId = "wascana.mingw.gcc4.core";
@ -122,7 +122,7 @@ public class MinGWGenerator implements IApplication {
IInstallableUnit gcc4coreIU = createIU(gcc4coreIUDesc, gcc4coreId, gcc4Version, IInstallableUnit gcc4coreIU = createIU(gcc4coreIUDesc, gcc4coreId, gcc4Version,
"http://downloads.sourceforge.net/tdm-gcc/gcc-4.3.2-tdm-1-core.tar.gz", "http://downloads.sourceforge.net/tdm-gcc/gcc-4.3.2-tdm-1-core.tar.gz",
mingwSubdir, mingwSubdir,
InstallArtifactRepository.GZIP_COMPRESSON); InstallArtifactRepository.GZIP_COMPRESSION);
// gcc-4 g++ // gcc-4 g++
String gcc4gppId = "wascana.mingw.gcc4.g++"; String gcc4gppId = "wascana.mingw.gcc4.g++";
@ -137,7 +137,7 @@ public class MinGWGenerator implements IApplication {
IInstallableUnit gcc4gppIU = createIU(gcc4gppIUDesc, gcc4gppId, gcc4Version, IInstallableUnit gcc4gppIU = createIU(gcc4gppIUDesc, gcc4gppId, gcc4Version,
"http://downloads.sourceforge.net/tdm-gcc/gcc-4.3.2-tdm-1-g++.tar.gz", "http://downloads.sourceforge.net/tdm-gcc/gcc-4.3.2-tdm-1-g++.tar.gz",
mingwSubdir, mingwSubdir,
InstallArtifactRepository.GZIP_COMPRESSON); InstallArtifactRepository.GZIP_COMPRESSION);
// gdb // gdb
String gdbId = "wascana.mingw.gdb"; String gdbId = "wascana.mingw.gdb";
@ -155,7 +155,7 @@ public class MinGWGenerator implements IApplication {
IInstallableUnit msysIU = createIU(msysIUDesc, msysId, msysVersion, IInstallableUnit msysIU = createIU(msysIUDesc, msysId, msysVersion,
"http://downloads.sourceforge.net/mingw/msysCORE-1.0.11-20080826.tar.gz", "http://downloads.sourceforge.net/mingw/msysCORE-1.0.11-20080826.tar.gz",
"msys", "msys",
InstallArtifactRepository.GZIP_COMPRESSON); InstallArtifactRepository.GZIP_COMPRESSION);
// MinGW toolchain category // MinGW toolchain category
InstallableUnitDescription mingwToolchainDesc = createIUDesc("wascana.mingw", wascanaVersion, "MinGW Toolchain", null);; InstallableUnitDescription mingwToolchainDesc = createIUDesc("wascana.mingw", wascanaVersion, "MinGW Toolchain", null);;
@ -200,9 +200,9 @@ public class MinGWGenerator implements IApplication {
Version sdlVersion = new Version("1.2.13"); Version sdlVersion = new Version("1.2.13");
InstallableUnitDescription sdlIUDesc = createIUDesc(sdlId, sdlVersion, "Wascana SDL (Simple Directmedia Layer) Library", lgplLic); InstallableUnitDescription sdlIUDesc = createIUDesc(sdlId, sdlVersion, "Wascana SDL (Simple Directmedia Layer) Library", lgplLic);
IInstallableUnit sdlIU = createIU(sdlIUDesc, sdlId, sdlVersion, IInstallableUnit sdlIU = createIU(sdlIUDesc, sdlId, sdlVersion,
"http://www.libsdl.org/release/SDL-devel-1.2.13-mingw32.tar.gz", "http://downloads.sourceforge.net/wascana/SDL-mingw-1.2.13.zip",
mingwSubdir, mingwSubdir,
InstallArtifactRepository.GZIP_COMPRESSON); InstallArtifactRepository.ZIP_COMPRESSION);
// Libraries toolchain category // Libraries toolchain category
InstallableUnitDescription libsIUDesc = createIUDesc("wascana.libs", wascanaVersion, "Libraries", null);; InstallableUnitDescription libsIUDesc = createIUDesc("wascana.libs", wascanaVersion, "Libraries", null);;
@ -211,6 +211,9 @@ public class MinGWGenerator implements IApplication {
MetadataFactory.createRequiredCapability( MetadataFactory.createRequiredCapability(
IInstallableUnit.NAMESPACE_IU_ID, IInstallableUnit.NAMESPACE_IU_ID,
zlibIU.getId(), new VersionRange(null), null, false, false), zlibIU.getId(), new VersionRange(null), null, false, false),
MetadataFactory.createRequiredCapability(
IInstallableUnit.NAMESPACE_IU_ID,
sdlIU.getId(), new VersionRange(null), null, false, false),
}; };
libsIUDesc.setRequiredCapabilities(libsReqs); libsIUDesc.setRequiredCapabilities(libsReqs);
IInstallableUnit libsIU = MetadataFactory.createInstallableUnit(libsIUDesc); IInstallableUnit libsIU = MetadataFactory.createInstallableUnit(libsIUDesc);
@ -226,6 +229,7 @@ public class MinGWGenerator implements IApplication {
mingwToolchainIU, mingwToolchainIU,
zlibIU, zlibIU,
sdlIU,
libsIU libsIU
}); });

2
p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java
View file

@ -54,7 +54,7 @@ public class InstallArtifactRepository extends AbstractArtifactRepository {
public static final String FILENAME = "installArtifact.xml"; //$NON-NLS-1$ public static final String FILENAME = "installArtifact.xml"; //$NON-NLS-1$
public static final String COMPRESSION = "compression"; public static final String COMPRESSION = "compression";
public static final String GZIP_COMPRESSON = "tar.gz"; public static final String GZIP_COMPRESSION = "tar.gz";
public static final String BZIP2_COMPRESSION = "tar.bz2"; public static final String BZIP2_COMPRESSION = "tar.bz2";
public static final String ZIP_COMPRESSION = "zip"; public static final String ZIP_COMPRESSION = "zip";

2
p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/TarExtractor.java
View file

@ -43,7 +43,7 @@ public class TarExtractor extends Thread {
public void run() { public void run() {
try { try {
InputStream compIn; InputStream compIn;
if (InstallArtifactRepository.GZIP_COMPRESSON.equals(compression)) if (InstallArtifactRepository.GZIP_COMPRESSION.equals(compression))
compIn = new GZIPInputStream(in); compIn = new GZIPInputStream(in);
else if (InstallArtifactRepository.BZIP2_COMPRESSION.equals(compression)) { else if (InstallArtifactRepository.BZIP2_COMPRESSION.equals(compression)) {
// Skip the magic bytes first // Skip the magic bytes first

2
p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/ZipExtractor.java
View file

@ -41,6 +41,8 @@ public class ZipExtractor extends Thread {
} }
zipIn.closeEntry(); zipIn.closeEntry();
} }
// Keep reading until there's none left
while (in.read() != -1);
zipIn.close(); zipIn.close();
fileListWriter.close(); fileListWriter.close();
} catch (IOException e) { } catch (IOException e) {