Migrate adodb via composer to vendor directory.

-Incorporated phing into package management.
openemr · Jul 22, 2016 · 0f06ca8 · 0f06ca8
1 parent 340b2b3
commit 0f06ca8
Show file tree

Hide file tree

Showing 213 changed files with 3,249 additions and 13,095 deletions.
diff --git a/build.xml b/build.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="OpenEMR" description="OpenEMR is a Free and Open Source electronic health records and medical practice management application" default="dist" basedir="." >
+
+<property name="dir.src" value="${project.basedir}"/>
+<property name="dir.vendor" value="${project.basedir}/vendor"/>
+
+<target name="vendor-clean">
+	<echo msg="Trying to clean up vendor dir" />
+	<phingcall target="clean-vendor-dir">
+	</phingcall>
+</target>	
+
+
+<target name="clean-vendor-dir">
+	<!-- Delete git files from vendor  -->
+	<delete verbose="true">
+    <fileset dir="${dir.vendor}" includes="**/*.git*" defaultexcludes="false"/>
+    <fileset dir="${dir.vendor}" includes="**/*.cvs*" defaultexcludes="false"/>
+	</delete>
+
+	<delete dir="${dir.vendor}/adodb/adodb-php/tests" verbose="true"/>
+	<delete dir="${dir.vendor}/adodb/adodb-php/docs" verbose="true"/>
+
+	<delete dir="${dir.vendor}/smarty/smarty/demo" verbose="true"/>
+
+</target>
+</project>
diff --git a/composer.json b/composer.json
@@ -1,17 +1,23 @@
 {
-	"name": "openemr/openemr",
-	"description": "OpenEMR is a Free and Open Source electronic health records and medical practice management application",
-	"license": "GPL",
+    "name": "openemr/openemr",
+    "description": "OpenEMR is a Free and Open Source electronic health records and medical practice management application",
+    "license": "GPL",
     "support": {
         "website": "http://www.open-emr.org/",
         "issues": "https://sourceforge.net/p/openemr/bugs/",
         "forum": "https://sourceforge.net/p/openemr/discussion/",
         "wiki": "http://www.open-emr.org/wiki/index.php/OpenEMR_Wiki_Home_Page",
         "source": "http://github.com/openemr/openemr"
     },
-	"require": {
+    "require": {
 
-        "smarty/smarty": "2.6.29"
-
-	}
+        "smarty/smarty": "2.6.29",
+        "adodb/adodb-php": "5.20.2"
+
+    },
+    "require-dev": {
+
+        "phing/phing": "2.14.0"
+
+    }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/gacl/gacl.class.php b/gacl/gacl.class.php
@@ -36,7 +36,7 @@
  */
 
 if ( !defined('ADODB_DIR') ) {
-	define('ADODB_DIR', dirname(__FILE__).'/../library/adodb');
+	define('ADODB_DIR', dirname(__FILE__).'/../vendor/adodb/adodb-php');
 }
 
 //openemr configuration file - bm - 05-2009

diff --git a/interface/main/calendar/includes/pnAPI.php b/interface/main/calendar/includes/pnAPI.php
@@ -346,7 +346,7 @@ function pnInit()
 
     // ADODB configuration
     if (!defined('ADODB_DIR')) {
-        define('ADODB_DIR', dirname(__FILE__) . '/../../../../library/adodb');
+        define('ADODB_DIR', dirname(__FILE__) . '/../../../../vendor/adodb/adodb-php');
     }
 
     require ADODB_DIR . '/adodb.inc.php';
@@ -1505,4 +1505,4 @@ function pnMailHackAttempt( $detecting_file        =        "(no filename availa
         return;
 }
 
-?>
+?>
diff --git a/library/adodb/chris.php b/library/adodb/chris.php
diff --git a/library/adodb/docs/adodb-faq.html b/library/adodb/docs/adodb-faq.html
diff --git a/library/adodb/docs/adodb.gif b/library/adodb/docs/adodb.gif
diff --git a/library/adodb/docs/adodb2.gif b/library/adodb/docs/adodb2.gif