[gnome-builder: 20/139] build: move libeditorconfig to plugin location

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder: 20/139] build: move libeditorconfig to plugin location
Date: Thu, 10 Jan 2019 04:19:00 +0000 (UTC)
commit 75e3a1924286c6829ddf1ab3e0ab7898e1e3b3d2
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 15:10:27 2019 -0800

    build: move libeditorconfig to plugin location
    
    A new editorconfig plugin will land that will use this static library.
    This moves the old code into place.

 src/{ => plugins/editorconfig}/libeditorconfig/ec_glob.c       |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/ec_glob.h       |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/editorconfig.c  |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/editorconfig.h  | 10 +++++-----
 .../editorconfig}/libeditorconfig/editorconfig/editorconfig.h  |  2 +-
 .../libeditorconfig/editorconfig/editorconfig_handle.h         |  2 +-
 .../editorconfig}/libeditorconfig/editorconfig_handle.c        |  2 +-
 .../editorconfig}/libeditorconfig/editorconfig_handle.h        |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/global.h        |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/ini.c           |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/ini.h           |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/meson.build     |  4 ----
 src/{ => plugins/editorconfig}/libeditorconfig/misc.c          |  8 ++++----
 src/{ => plugins/editorconfig}/libeditorconfig/misc.h          |  2 +-
 src/{ => plugins/editorconfig}/libeditorconfig/utarray.h       |  2 +-
 15 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/src/libeditorconfig/ec_glob.c b/src/plugins/editorconfig/libeditorconfig/ec_glob.c
similarity index 99%
rename from src/libeditorconfig/ec_glob.c
rename to src/plugins/editorconfig/libeditorconfig/ec_glob.c
index ee3caf390..86b57ad1d 100644
--- a/src/libeditorconfig/ec_glob.c
+++ b/src/plugins/editorconfig/libeditorconfig/ec_glob.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 Hong Xu <hong AT topbug DOT net>
+ * Copyright 2014 Hong Xu <hong AT topbug DOT net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/ec_glob.h b/src/plugins/editorconfig/libeditorconfig/ec_glob.h
similarity index 96%
rename from src/libeditorconfig/ec_glob.h
rename to src/plugins/editorconfig/libeditorconfig/ec_glob.h
index 144b63d84..7da19df99 100644
--- a/src/libeditorconfig/ec_glob.h
+++ b/src/plugins/editorconfig/libeditorconfig/ec_glob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 Hong Xu <hong AT topbug DOT net>
+ * Copyright 2014 Hong Xu <hong AT topbug DOT net>
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/editorconfig.c b/src/plugins/editorconfig/libeditorconfig/editorconfig.c
similarity index 99%
rename from src/libeditorconfig/editorconfig.c
rename to src/plugins/editorconfig/libeditorconfig/editorconfig.c
index 4968e56f1..5042c2092 100644
--- a/src/libeditorconfig/editorconfig.c
+++ b/src/plugins/editorconfig/libeditorconfig/editorconfig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/editorconfig.h b/src/plugins/editorconfig/libeditorconfig/editorconfig.h
similarity index 94%
rename from src/libeditorconfig/editorconfig.h
rename to src/plugins/editorconfig/libeditorconfig/editorconfig.h
index e7bbc7ba5..f0fa95733 100644
--- a/src/libeditorconfig/editorconfig.h
+++ b/src/plugins/editorconfig/libeditorconfig/editorconfig.h
@@ -1,16 +1,16 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,7 +27,7 @@
 #ifndef __EDITORCONFIG_H__
 #define __EDITORCONFIG_H__
 
-#include <editorconfig/editorconfig.h>
+#include "editorconfig/editorconfig.h"
 
 #include "editorconfig_handle.h"
 
diff --git a/src/libeditorconfig/editorconfig/editorconfig.h 
b/src/plugins/editorconfig/libeditorconfig/editorconfig/editorconfig.h
similarity index 99%
rename from src/libeditorconfig/editorconfig/editorconfig.h
rename to src/plugins/editorconfig/libeditorconfig/editorconfig/editorconfig.h
index 468e794a2..a4ae1ad74 100644
--- a/src/libeditorconfig/editorconfig/editorconfig.h
+++ b/src/plugins/editorconfig/libeditorconfig/editorconfig/editorconfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2013 EditorConfig Team
+ * Copyright 2011-2013 EditorConfig Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/editorconfig/editorconfig_handle.h 
b/src/plugins/editorconfig/libeditorconfig/editorconfig/editorconfig_handle.h
similarity index 99%
rename from src/libeditorconfig/editorconfig/editorconfig_handle.h
rename to src/plugins/editorconfig/libeditorconfig/editorconfig/editorconfig_handle.h
index f9d70969f..35f4be91e 100644
--- a/src/libeditorconfig/editorconfig/editorconfig_handle.h
+++ b/src/plugins/editorconfig/libeditorconfig/editorconfig/editorconfig_handle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/editorconfig_handle.c 
b/src/plugins/editorconfig/libeditorconfig/editorconfig_handle.c
similarity index 98%
rename from src/libeditorconfig/editorconfig_handle.c
rename to src/plugins/editorconfig/libeditorconfig/editorconfig_handle.c
index 4f798288b..e00039837 100644
--- a/src/libeditorconfig/editorconfig_handle.c
+++ b/src/plugins/editorconfig/libeditorconfig/editorconfig_handle.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/editorconfig_handle.h 
b/src/plugins/editorconfig/libeditorconfig/editorconfig_handle.h
similarity index 98%
rename from src/libeditorconfig/editorconfig_handle.h
rename to src/plugins/editorconfig/libeditorconfig/editorconfig_handle.h
index f8fe3f77d..f36f34224 100644
--- a/src/libeditorconfig/editorconfig_handle.h
+++ b/src/plugins/editorconfig/libeditorconfig/editorconfig_handle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/global.h b/src/plugins/editorconfig/libeditorconfig/global.h
similarity index 98%
rename from src/libeditorconfig/global.h
rename to src/plugins/editorconfig/libeditorconfig/global.h
index b43bba40e..235693f25 100644
--- a/src/libeditorconfig/global.h
+++ b/src/plugins/editorconfig/libeditorconfig/global.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/ini.c b/src/plugins/editorconfig/libeditorconfig/ini.c
similarity index 99%
rename from src/libeditorconfig/ini.c
rename to src/plugins/editorconfig/libeditorconfig/ini.c
index c01da5d64..08fc0eae0 100644
--- a/src/libeditorconfig/ini.c
+++ b/src/plugins/editorconfig/libeditorconfig/ini.c
@@ -2,7 +2,7 @@
 
 The "inih" library is distributed under the New BSD license:
 
-Copyright © 2009, Brush Technology
+Copyright 2009, Brush Technology
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/ini.h b/src/plugins/editorconfig/libeditorconfig/ini.h
similarity index 99%
rename from src/libeditorconfig/ini.h
rename to src/plugins/editorconfig/libeditorconfig/ini.h
index d3ab311e2..321da462d 100644
--- a/src/libeditorconfig/ini.h
+++ b/src/plugins/editorconfig/libeditorconfig/ini.h
@@ -2,7 +2,7 @@
 
 The "inih" library is distributed under the New BSD license:
 
-Copyright © 2009, Brush Technology
+Copyright 2009, Brush Technology
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/meson.build b/src/plugins/editorconfig/libeditorconfig/meson.build
similarity index 95%
rename from src/libeditorconfig/meson.build
rename to src/plugins/editorconfig/libeditorconfig/meson.build
index 6c59ace0f..d30561e1f 100644
--- a/src/libeditorconfig/meson.build
+++ b/src/plugins/editorconfig/libeditorconfig/meson.build
@@ -1,5 +1,3 @@
-if get_option('with_editorconfig')
-
 libeditorconfig_sources = [
   'ec_glob.c',
   'ec_glob.h',
@@ -45,5 +43,3 @@ libeditorconfig_dep = declare_dependency(
             link_with: libeditorconfig,
   include_directories: include_directories('.'),
 )
-
-endif
diff --git a/src/libeditorconfig/misc.c b/src/plugins/editorconfig/libeditorconfig/misc.c
similarity index 98%
rename from src/libeditorconfig/misc.c
rename to src/plugins/editorconfig/libeditorconfig/misc.c
index fc0455b05..143d618f5 100644
--- a/src/libeditorconfig/misc.c
+++ b/src/plugins/editorconfig/libeditorconfig/misc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 /*
  * strcasecmp function from FreeBSD
  *
- * Copyright © 1987, 1993
+ * Copyright 1987, 1993
  * The Regents of the University of California. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -86,7 +86,7 @@ int ec_strcasecmp(const char *s1, const char *s2)
 /*
  * strdup function from FreeBSD
  *
- * Copyright © 1988, 1993
+ * Copyright 1988, 1993
  * The Regents of the University of California. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -140,7 +140,7 @@ char* ec_strdup(const char *str)
  *
  * $NetBSD: strndup.c,v 1.3 2007/01/14 23:41:24 cbiere Exp $ 
  *
- * Copyright © 1988, 1993
+ * Copyright 1988, 1993
  *  The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/misc.h b/src/plugins/editorconfig/libeditorconfig/misc.h
similarity index 98%
rename from src/libeditorconfig/misc.h
rename to src/plugins/editorconfig/libeditorconfig/misc.h
index eaae2c8c2..f73554429 100644
--- a/src/libeditorconfig/misc.h
+++ b/src/plugins/editorconfig/libeditorconfig/misc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011-2012 EditorConfig Team
+ * Copyright 2011-2012 EditorConfig Team
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/libeditorconfig/utarray.h b/src/plugins/editorconfig/libeditorconfig/utarray.h
similarity index 99%
rename from src/libeditorconfig/utarray.h
rename to src/plugins/editorconfig/libeditorconfig/utarray.h
index 768f0265e..e4fdf77e4 100644
--- a/src/libeditorconfig/utarray.h
+++ b/src/plugins/editorconfig/libeditorconfig/utarray.h
@@ -1,5 +1,5 @@
 /*
-Copyright © 2008-2014, Troy D. Hanson   http://troydhanson.github.com/uthash/
+Copyright 2008-2014, Troy D. Hanson   http://troydhanson.github.com/uthash/
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]