From fa6aadc1650cbc71dedf2b2489d65415b793b922 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 25 Feb 2019 16:08:01 +0800
Subject: [PATCH] Fix #5753 - roojspacker force dependancy on JSON for the time
 being

---
 CMakeLists.txt          |  2 +-
 config1.builder         |  4 ++--
 roojspacker/Packer.vala | 36 +++++++++++++++++++++---------------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd29425..83dd774 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ set(ROOJSPACKER_VALA_PACKAGES
     json-glib-1.0
 )
 
-
+ 
 
 set(CFLAGS
 	${GOBJECT_CFLAGS} ${GOBJECT_CFLAGS_OTHER}
diff --git a/config1.builder b/config1.builder
index f143d40..f9e35f7 100644
--- a/config1.builder
+++ b/config1.builder
@@ -36,10 +36,10 @@
         "execute_args" : "",
         "target_bin" : "",
         "sources" : [
-            "/src/jsdoc",
             "..//roojspacker",
             "../../../../usr/share/vala/vapi",
-            "/src"
+            "/roojspacker",
+            "/bin"
         ],
         "packages" : [
             "glib-2.0",
diff --git a/roojspacker/Packer.vala b/roojspacker/Packer.vala
index de38574..782e40c 100644
--- a/roojspacker/Packer.vala
+++ b/roojspacker/Packer.vala
@@ -101,16 +101,16 @@ namespace JSDOC
 		public Packer(PackerRun config)
 		{
 			this.config = config;
-#if HAVE_JSON_GLIB
+//#if HAVE_JSON_GLIB
 			this.result = new Json.Object();
-#else
-			this.result_count = new  Gee.HashMap <string,int>();
-		
-			this.result =  new Gee.HashMap<
-				string /* errtype*/ , Gee.HashMap<string /*fn*/,     Gee.HashMap<int /*line*/, Gee.ArrayList<string>>>
-			>();
-	
-#endif			
+//#else
+//			this.result_count = new  Gee.HashMap <string,int>();
+//		
+//			this.result =  new Gee.HashMap<
+//#				string /* errtype*/ , Gee.HashMap<string /*fn*/,     Gee.HashMap<int /*line*/, Gee.ArrayList<string>>>
+//#			>();
+//#endif			
+//
 			this.files = new Gee.ArrayList<string>();
 			
 			new Lang_Class(); ///initilizaze lang..
@@ -148,7 +148,7 @@ namespace JSDOC
 		*
 		*/
 		
-#if HAVE_JSON_GLIB
+//#if HAVE_JSON_GLIB
 		
 		public Json.Object result;   // output - what's the complication result
 
@@ -212,11 +212,14 @@ namespace JSDOC
 			
 			});
 		}
-#else
+/*#else
 		public Gee.HashMap <string,int> result_count;   // output - what's the complication result
 		
 		public Gee.HashMap<
-				string /* errtype*/ , Gee.HashMap<string /*fn*/,     Gee.HashMap<int /*line*/, Gee.ArrayList<string>>>
+				string // errtype
+				, Gee.HashMap<string //fn
+					,Gee.HashMap<int //line 
+						, Gee.ArrayList<string>>>
 		> result;
 
 		public void  logError(ResultType type, string filename, int line, string message) {
@@ -234,12 +237,15 @@ namespace JSDOC
 			 
 			 if (!this.result.has_key(type.to_string())) {
 				 this.result.set(type.to_string(),
-					 new Gee.HashMap<string /*fn*/,     Gee.HashMap<int /*line*/, Gee.ArrayList<string>>>()
+					 new Gee.HashMap<string //fn 
+					 ,     Gee.HashMap<int //line
+					 		, Gee.ArrayList<string>>>()
 				 );
 			 }
 			 var t = this.result.get(type.to_string());
 			 if (!t.has_key(filename)) {
-				 t.set(filename, new  Gee.HashMap<int /*line*/, Gee.ArrayList<string>>());
+				 t.set(filename, new  Gee.HashMap<int //line
+					 , Gee.ArrayList<string>>());
 			 }
 			 var tt = t.get(filename);
 			 if (!tt.has_key(line)) {
@@ -286,7 +292,7 @@ namespace JSDOC
 
 
 #endif
-		
+*/		
 		
 		
 		public void loadSourceIndexes(Gee.ArrayList<string> indexes)
-- 
2.39.2