From e5ef3e1340f68fdcc46ba318dab1773b8fb530a8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 2 May 2012 23:48:23 +0200
Subject: [PATCH] move archive library to core so we can properly depend on it
---
apps/files_archive/appinfo/app.php | 6 ------
{apps/files_archive/lib => lib}/archive.php | 0
{apps/files_archive/lib => lib/archive}/tar.php | 2 ++
{apps/files_archive/lib => lib/archive}/zip.php | 0
{apps/files_archive/tests => tests/lib}/archive.php | 0
{apps/files_archive/tests => tests/lib/archive}/tar.php | 0
{apps/files_archive/tests => tests/lib/archive}/zip.php | 0
7 files changed, 2 insertions(+), 6 deletions(-)
rename {apps/files_archive/lib => lib}/archive.php (100%)
rename {apps/files_archive/lib => lib/archive}/tar.php (99%)
rename {apps/files_archive/lib => lib/archive}/zip.php (100%)
rename {apps/files_archive/tests => tests/lib}/archive.php (100%)
rename {apps/files_archive/tests => tests/lib/archive}/tar.php (100%)
rename {apps/files_archive/tests => tests/lib/archive}/zip.php (100%)
diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php
index 5d402b61ff7..0b156ced277 100755
--- a/apps/files_archive/appinfo/app.php
+++ b/apps/files_archive/appinfo/app.php
@@ -6,12 +6,6 @@
* See the COPYING-README file.
*/
-OC::$CLASSPATH['OC_Archive'] = 'apps/files_archive/lib/archive.php';
-OC::$CLASSPATH['Archive_Tar'] = '3rdparty/Archive/Tar.php';
-foreach(array('ZIP','TAR') as $type){
- OC::$CLASSPATH['OC_Archive_'.$type] = 'apps/files_archive/lib/'.strtolower($type).'.php';
-}
-
OC::$CLASSPATH['OC_Filestorage_Archive']='apps/files_archive/lib/storage.php';
OC_Hook::connect('OC_Filesystem','get_mountpoint','OC_Filestorage_Archive','autoMount');
diff --git a/apps/files_archive/lib/archive.php b/lib/archive.php
similarity index 100%
rename from apps/files_archive/lib/archive.php
rename to lib/archive.php
diff --git a/apps/files_archive/lib/tar.php b/lib/archive/tar.php
similarity index 99%
rename from apps/files_archive/lib/tar.php
rename to lib/archive/tar.php
index 2cb8dc2a8ae..07f0ba5bd8a 100755
--- a/apps/files_archive/lib/tar.php
+++ b/lib/archive/tar.php
@@ -6,6 +6,8 @@
* See the COPYING-README file.
*/
+require_once '3rdparty/Archive/Tar.php';
+
class OC_Archive_TAR extends OC_Archive{
const PLAIN=0;
const GZIP=1;
diff --git a/apps/files_archive/lib/zip.php b/lib/archive/zip.php
similarity index 100%
rename from apps/files_archive/lib/zip.php
rename to lib/archive/zip.php
diff --git a/apps/files_archive/tests/archive.php b/tests/lib/archive.php
similarity index 100%
rename from apps/files_archive/tests/archive.php
rename to tests/lib/archive.php
diff --git a/apps/files_archive/tests/tar.php b/tests/lib/archive/tar.php
similarity index 100%
rename from apps/files_archive/tests/tar.php
rename to tests/lib/archive/tar.php
diff --git a/apps/files_archive/tests/zip.php b/tests/lib/archive/zip.php
similarity index 100%
rename from apps/files_archive/tests/zip.php
rename to tests/lib/archive/zip.php
--
GitLab