2010-12-26 Adam Barth <abarth@webkit.org>

        Reviewed by Eric Seidel.

        [Meta] Move source code into Sources
        https://bugs.webkit.org/show_bug.cgi?id=51606

        * PrettyPatch/PrettyPatch.rb:
          - Remove reference to non-existant autotools directory.
2010-12-26  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Siedel.

        [Meta] Move source code into Sources
        https://bugs.webkit.org/show_bug.cgi?id=51606

        * .gitignore:
        * GNUmakefile.am:
        * Sources/autotools: Copied from autotools.
        * autogen.sh:
        * autotools: Removed.
        * autotools/acinclude.m4: Removed.
        * autotools/dolt.m4: Removed.
        * autotools/gsettings.m4: Removed.
        * autotools/symbols.filter: Removed.
        * autotools/webkit.m4: Removed.
        * configure.ac:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index 32dbe0dfb66e4648835ac3c91e032c41e962533d..2fac9d8350941ef233cdbea32a46028486841367 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -72,19 +72,19 @@ LayoutTests/java/*.class
 # a few files into the source tree.
 /aclocal.m4
 /autom4te.cache
-/autotools/compile
-/autotools/config.guess
-/autotools/config.sub
-/autotools/depcomp
-/autotools/gtk-doc.m4
-/autotools/install-sh
-/autotools/libtool.m4
-/autotools/ltmain.sh
-/autotools/ltoptions.m4
-/autotools/ltsugar.m4
-/autotools/ltversion.m4
-/autotools/lt~obsolete.m4
-/autotools/missing
+/Sources/autotools/compile
+/Sources/autotools/config.guess
+/Sources/autotools/config.sub
+/Sources/autotools/depcomp
+/Sources/autotools/gtk-doc.m4
+/Sources/autotools/install-sh
+/Sources/autotools/libtool.m4
+/Sources/autotools/ltmain.sh
+/Sources/autotools/ltoptions.m4
+/Sources/autotools/ltsugar.m4
+/Sources/autotools/ltversion.m4
+/Sources/autotools/lt~obsolete.m4
+/Sources/autotools/missing
 /autotoolsconfig.h.in
 /configure
 /GNUmakefile.in

diff --git a/ChangeLog b/ChangeLog
index 3dca706824fb569809e7c84d5ca49101d8507585..55c212819265f6ae374aa4a89a551cad67cfa525 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Siedel.
+
+        [Meta] Move source code into Sources
+        https://bugs.webkit.org/show_bug.cgi?id=51606
+
+        * .gitignore:
+        * GNUmakefile.am:
+        * Sources/autotools: Copied from autotools.
+        * autogen.sh:
+        * autotools: Removed.
+        * autotools/acinclude.m4: Removed.
+        * autotools/dolt.m4: Removed.
+        * autotools/gsettings.m4: Removed.
+        * autotools/symbols.filter: Removed.
+        * autotools/webkit.m4: Removed.
+        * configure.ac:
+
 2010-12-26  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index b569e8961baad3ee72dbc4c6bee6b05a5401997d..2db5848fc2d66b0887713b08c09f188786cf8c74 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -102,7 +102,7 @@ version_script = -export-symbols-regex "^(webkit_|k?JS).*"
 endif
 
 if OS_GNU
-version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
+version_script = -Wl,--version-script,$(srcdir)/Sources/autotools/symbols.filter
 endif
 
 # Convenience libraries
@@ -196,7 +196,7 @@ global_cppflags += \
 endif
 
 EXTRA_DIST += \
-       $(srcdir)/autotools/symbols.filter \
+       $(srcdir)/Sources/autotools/symbols.filter \
        $(srcdir)/gtk-doc.make \
        $(srcdir)/WebKit/LICENSE
 
@@ -227,11 +227,11 @@ MAINTAINERCLEANFILES += \
        $(builddir)/doltcompile \
        $(builddir)/doltlibtool \
        $(srcdir)/aconfig.h.in \
-       $(srcdir)/autotools/config.* \
-       $(srcdir)/autotools/compile \
-       $(srcdir)/autotools/depcomp \
-       $(srcdir)/autotools/install-sh \
-       $(srcdir)/autotools/missing \
+       $(srcdir)/Sources/autotools/config.* \
+       $(srcdir)/Sources/autotools/compile \
+       $(srcdir)/Sources/autotools/depcomp \
+       $(srcdir)/Sources/autotools/install-sh \
+       $(srcdir)/Sources/autotools/missing \
        $(srcdir)/configure \
        $(srcdir)/GNUmakefile.in \
        $(srcdir)/INSTALL \

diff --git a/autotools/acinclude.m4 b/Sources/autotools/acinclude.m4
similarity index 100%
rename from autotools/acinclude.m4
rename to Sources/autotools/acinclude.m4

diff --git a/autotools/dolt.m4 b/Sources/autotools/dolt.m4
similarity index 100%
rename from autotools/dolt.m4
rename to Sources/autotools/dolt.m4

diff --git a/autotools/gsettings.m4 b/Sources/autotools/gsettings.m4
similarity index 100%
rename from autotools/gsettings.m4
rename to Sources/autotools/gsettings.m4

diff --git a/autotools/symbols.filter b/Sources/autotools/symbols.filter
similarity index 100%
rename from autotools/symbols.filter
rename to Sources/autotools/symbols.filter

diff --git a/autotools/webkit.m4 b/Sources/autotools/webkit.m4
similarity index 100%
rename from autotools/webkit.m4
rename to Sources/autotools/webkit.m4

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 8f938c692351a8b65bd4bcdd8ae967c9b6343f4c..bc20ec35ad57585114fcc4581ad30d9f54216c05 100644 (file)
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [Meta] Move source code into Sources
+        https://bugs.webkit.org/show_bug.cgi?id=51606
+
+        * PrettyPatch/PrettyPatch.rb:
+          - Remove reference to non-existant autotools directory.
+
 2010-12-26  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 3e8e0901fa2435c77eeeb718853258f85d1c5c0c..5d7f0309e230b2cf4786bb6dc26106303f6980c0 100644 (file)
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -76,7 +76,6 @@ private
         WebKit2
         WebKitLibraries
         Websites
-        autotools
     ]
 
     def self.find_url_and_path(file_path)

diff --git a/autogen.sh b/autogen.sh
index 60b163d5503dc4e677b0c26b7e97dc039cf398ed..0496fec7799fdc20352d1f27c76eb92bf2230b48 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ cd $srcdir
 
 GTKDOCIZE_FLAGS="--copy"
 LIBTOOLIZE_FLAGS="--force --automake"
-ACLOCAL_FLAGS="-I autotools $ACLOCAL_FLAGS"
+ACLOCAL_FLAGS="-I Sources/autotools $ACLOCAL_FLAGS"
 AUTOMAKE_FLAGS="--foreign --add-missing"
 
 DIE=0

diff --git a/configure.ac b/configure.ac
index 9a45d0c2253f0f1d504d85143091dae85ac45789..9724adca016b7ac64304dacdae1a7874d99ac2d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,9 @@ m4_define([webkit_user_agent_minor_version], [7])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
-AC_CONFIG_MACRO_DIR([autotools])
-AC_CONFIG_AUX_DIR([autotools])
-AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
+AC_CONFIG_MACRO_DIR([Sources/autotools])
+AC_CONFIG_AUX_DIR([Sources/autotools])
+AC_SUBST(ACLOCAL_AMFLAGS, "-I Sources/autotools")
 
 AC_CONFIG_HEADERS([autotoolsconfig.h])
 AC_CANONICAL_HOST