From db07bafb5b04abe8ad3dd3c4866b5ddc10c64b89 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 15 May 2011 12:25:36 +0000
Subject: [PATCH] HipHop build fixes: * Generate the file list from the
 autoloader so that it won't break so often * Removed spyc.php from
 AutoLoader.php, was deleted in r86302

---
 includes/AutoLoader.php            |   1 -
 maintenance/hiphop/extra-files     |  35 ++++
 maintenance/hiphop/file-list.small | 289 -----------------------------
 maintenance/hiphop/make            |  13 +-
 4 files changed, 47 insertions(+), 291 deletions(-)
 create mode 100644 maintenance/hiphop/extra-files
 delete mode 100644 maintenance/hiphop/file-list.small

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index eca92cdeed..0d2903a109 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -504,7 +504,6 @@ $wgAutoloadLocalClasses = array(
 	'CSSMin' => 'includes/libs/CSSMin.php',
 	'IEContentAnalyzer' => 'includes/libs/IEContentAnalyzer.php',
 	'JavaScriptMinifier' => 'includes/libs/JavaScriptMinifier.php',
-	'Spyc' => 'includes/libs/spyc.php',
 
 	# includes/media
 	'BitmapHandler' => 'includes/media/Bitmap.php',
diff --git a/maintenance/hiphop/extra-files b/maintenance/hiphop/extra-files
new file mode 100644
index 0000000000..15f48577e9
--- /dev/null
+++ b/maintenance/hiphop/extra-files
@@ -0,0 +1,35 @@
+img_auth.php
+includes/AjaxFunctions.php
+includes/AutoLoader.php
+includes/DefaultSettings.php
+includes/Defines.php
+includes/GlobalFunctions.php
+includes/ImageFunctions.php
+includes/OutputHandler.php
+includes/ProxyTools.php
+includes/SeleniumWebSettings.php
+includes/Setup.php
+includes/StreamFile.php
+includes/WebStart.php
+includes/filerepo/NullRepo.php
+includes/normal/UtfNormalDefines.php
+includes/normal/UtfNormalUtil.php
+index.php
+languages/Names.php
+load.php
+maintenance/Maintenance.php
+maintenance/commandLine.inc
+maintenance/doMaintenance.php
+maintenance/eval.php
+opensearch_desc.php
+profileinfo.php
+redirect.php
+resources/Resources.php
+serialized/serialize.php
+skins/MonoBook.deps.php
+skins/MonoBook.php
+skins/Vector.deps.php
+skins/Vector.php
+thumb.php
+trackback.php
+
diff --git a/maintenance/hiphop/file-list.small b/maintenance/hiphop/file-list.small
deleted file mode 100644
index 0f7a8ba0fe..0000000000
--- a/maintenance/hiphop/file-list.small
+++ /dev/null
@@ -1,289 +0,0 @@
-img_auth.php
-includes/AjaxDispatcher.php
-includes/AjaxFunctions.php
-includes/AjaxResponse.php
-includes/Article.php
-includes/AuthPlugin.php
-includes/AutoLoader.php
-includes/Autopromote.php
-includes/BacklinkCache.php
-includes/Block.php
-includes/CacheDependency.php
-includes/Category.php
-includes/CategoryPage.php
-includes/Categoryfinder.php
-includes/Cdb.php
-includes/Cdb_PHP.php
-includes/ChangeTags.php
-includes/ChangesFeed.php
-includes/ChangesList.php
-includes/Collation.php
-includes/ConfEditor.php
-includes/Cookie.php
-includes/Credits.php
-includes/DefaultSettings.php
-includes/Defines.php
-includes/DjVuImage.php
-includes/EditPage.php
-includes/Exception.php
-includes/Exif.php
-includes/Export.php
-includes/ExternalEdit.php
-includes/ExternalStore.php
-includes/ExternalStoreDB.php
-includes/ExternalStoreHttp.php
-includes/ExternalUser.php
-includes/FakeTitle.php
-includes/Fallback.php
-includes/Feed.php
-includes/FeedUtils.php
-includes/FileDeleteForm.php
-includes/FileRevertForm.php
-includes/ForkController.php
-includes/FormOptions.php
-includes/GenderCache.php
-includes/GlobalFunctions.php
-includes/HTMLCacheUpdate.php
-includes/HTMLFileCache.php
-includes/HTMLForm.php
-includes/HistoryBlob.php
-includes/HistoryPage.php
-includes/Hooks.php
-includes/Html.php
-includes/HttpFunctions.old.php
-includes/HttpFunctions.php
-includes/IP.php
-includes/ImageFunctions.php
-includes/ImageGallery.php
-includes/ImagePage.php
-includes/ImageQueryPage.php
-includes/Import.php
-includes/Init.php
-includes/Interwiki.php
-includes/Licenses.php
-includes/LinkBatch.php
-includes/LinkCache.php
-includes/LinkFilter.php
-includes/Linker.php
-includes/LinksUpdate.php
-includes/LocalisationCache.php
-includes/LogEventsList.php
-includes/LogPage.php
-includes/MWFunction.php
-includes/MacBinary.php
-includes/MagicWord.php
-includes/Math.php
-includes/MemcachedSessions.php
-includes/Message.php
-includes/MessageBlobStore.php
-includes/MessageCache.php
-includes/Metadata.php
-includes/MimeMagic.php
-includes/Namespace.php
-includes/OutputHandler.php
-includes/OutputPage.php
-includes/PageQueryPage.php
-includes/Pager.php
-includes/PatrolLog.php
-includes/PoolCounter.php
-includes/Preferences.php
-includes/PrefixSearch.php
-includes/ProfilerStub.php
-includes/ProtectionForm.php
-includes/ProxyTools.php
-includes/QueryPage.php
-includes/RawPage.php
-includes/RecentChange.php
-includes/RequestContext.php
-includes/Revision.php
-includes/Sanitizer.php
-includes/SeleniumWebSettings.php
-includes/Setup.php
-includes/SiteConfiguration.php
-includes/SiteStats.php
-includes/Skin.php
-includes/SkinLegacy.php
-includes/SkinTemplate.php
-includes/SpecialPage.php
-includes/SquidPurgeClient.php
-includes/SquidUpdate.php
-includes/Status.php
-includes/StreamFile.php
-includes/StringUtils.php
-includes/StubObject.php
-includes/Title.php
-includes/TitleArray.php
-includes/User.php
-includes/UserArray.php
-includes/UserMailer.php
-includes/UserRightsProxy.php
-includes/ViewCountUpdate.php
-includes/WatchedItem.php
-includes/WebRequest.php
-includes/WebResponse.php
-includes/WebStart.php
-includes/Wiki.php
-includes/WikiError.php
-includes/WikiMap.php
-includes/Xml.php
-includes/XmlTypeCheck.php
-includes/ZipDirectoryReader.php
-includes/db/CloneDatabase.php
-includes/db/Database.php
-includes/db/DatabaseMysql.php
-includes/db/LBFactory.php
-includes/db/LBFactory_Multi.php
-includes/db/LBFactory_Single.php
-includes/db/LoadBalancer.php
-includes/db/LoadMonitor.php
-includes/diff/DairikiDiff.php
-includes/diff/DifferenceEngine.php
-includes/diff/WikiDiff3.php
-includes/extauth/Hardcoded.php
-includes/extauth/MediaWiki.php
-includes/extauth/vB.php
-includes/filerepo/ArchivedFile.php
-includes/filerepo/FSRepo.php
-includes/filerepo/File.php
-includes/filerepo/FileRepo.php
-includes/filerepo/FileRepoStatus.php
-includes/filerepo/ForeignAPIFile.php
-includes/filerepo/ForeignAPIRepo.php
-includes/filerepo/ForeignDBFile.php
-includes/filerepo/ForeignDBRepo.php
-includes/filerepo/ForeignDBViaLBRepo.php
-includes/filerepo/LocalFile.php
-includes/filerepo/LocalRepo.php
-includes/filerepo/NullRepo.php
-includes/filerepo/OldLocalFile.php
-includes/filerepo/RepoGroup.php
-includes/filerepo/UnregisteredLocalFile.php
-includes/installer/Installer.php
-includes/job/DoubleRedirectJob.php
-includes/job/EmaillingJob.php
-includes/job/EnotifNotifyJob.php
-includes/job/JobQueue.php
-includes/job/RefreshLinksJob.php
-includes/job/UploadFromUrlJob.php
-includes/json/FormatJson.php
-includes/json/Services_JSON.php
-includes/libs/CSSJanus.php
-includes/libs/CSSMin.php
-includes/libs/IEContentAnalyzer.php
-includes/libs/JavaScriptDistiller.php
-includes/libs/JavaScriptMinifier.php
-includes/libs/spyc.php
-includes/media/BMP.php
-includes/media/Bitmap.php
-includes/media/Bitmap_ClientOnly.php
-includes/media/DjVu.php
-includes/media/GIF.php
-includes/media/GIFMetadataExtractor.php
-includes/media/Generic.php
-includes/media/MediaTransformOutput.php
-includes/media/PNG.php
-includes/media/PNGMetadataExtractor.php
-includes/media/SVG.php
-includes/media/SVGMetadataExtractor.php
-includes/media/Tiff.php
-includes/normal/UtfNormal.php
-includes/normal/UtfNormalDefines.php
-includes/normal/UtfNormalUtil.php
-includes/objectcache/APCBagOStuff.php
-includes/objectcache/BagOStuff.php
-includes/objectcache/DBABagOStuff.php
-includes/objectcache/EhcacheBagOStuff.php
-includes/objectcache/EmptyBagOStuff.php
-includes/objectcache/HashBagOStuff.php
-includes/objectcache/MemcachedClient.php
-includes/objectcache/MemcachedPhpBagOStuff.php
-includes/objectcache/MultiWriteBagOStuff.php
-includes/objectcache/ObjectCache.php
-includes/objectcache/SqlBagOStuff.php
-includes/parser/CoreLinkFunctions.php
-includes/parser/CoreParserFunctions.php
-includes/parser/CoreTagHooks.php
-includes/parser/DateFormatter.php
-includes/parser/LinkHolderArray.php
-includes/parser/Parser.php
-includes/parser/ParserCache.php
-includes/parser/ParserOptions.php
-includes/parser/ParserOutput.php
-includes/parser/Parser_DiffTest.php
-includes/parser/Parser_LinkHooks.php
-includes/parser/Preprocessor.php
-includes/parser/Preprocessor_DOM.php
-includes/parser/Preprocessor_Hash.php
-includes/parser/StripState.php
-includes/parser/Tidy.php
-includes/proxy_check.php
-includes/resourceloader/ResourceLoader.php
-includes/resourceloader/ResourceLoaderContext.php
-includes/resourceloader/ResourceLoaderFileModule.php
-includes/resourceloader/ResourceLoaderModule.php
-includes/resourceloader/ResourceLoaderNoscriptModule.php
-includes/resourceloader/ResourceLoaderSiteModule.php
-includes/resourceloader/ResourceLoaderStartUpModule.php
-includes/resourceloader/ResourceLoaderUserGroupsModule.php
-includes/resourceloader/ResourceLoaderUserModule.php
-includes/resourceloader/ResourceLoaderUserOptionsModule.php
-includes/resourceloader/ResourceLoaderWikiModule.php
-includes/revisiondelete/RevisionDelete.php
-includes/revisiondelete/RevisionDeleteAbstracts.php
-includes/revisiondelete/RevisionDeleteUser.php
-includes/revisiondelete/RevisionDeleter.php
-includes/search/SearchEngine.php
-includes/search/SearchMySQL.php
-includes/search/SearchUpdate.php
-includes/specials/SpecialBlankpage.php
-includes/specials/SpecialCategories.php
-includes/specials/SpecialContributions.php
-includes/specials/SpecialEditWatchlist.php
-includes/specials/SpecialEmailuser.php
-includes/specials/SpecialExport.php
-includes/specials/SpecialImport.php
-includes/specials/SpecialLog.php
-includes/specials/SpecialMovepage.php
-includes/specials/SpecialPreferences.php
-includes/specials/SpecialRandompage.php
-includes/specials/SpecialRandomredirect.php
-includes/specials/SpecialRecentchanges.php
-includes/specials/SpecialRecentchangeslinked.php
-includes/specials/SpecialResetpass.php
-includes/specials/SpecialSearch.php
-includes/specials/SpecialSpecialpages.php
-includes/specials/SpecialUpload.php
-includes/specials/SpecialUploadStash.php
-includes/specials/SpecialUserlogin.php
-includes/specials/SpecialUserlogout.php
-includes/specials/SpecialWatchlist.php
-includes/specials/SpecialWhatlinkshere.php
-includes/templates/NoLocalSettings.php
-includes/templates/PHP4.php
-includes/templates/Userlogin.php
-includes/upload/UploadBase.php
-includes/upload/UploadFromFile.php
-includes/upload/UploadFromStash.php
-includes/upload/UploadFromUrl.php
-includes/upload/UploadStash.php
-index.php
-languages/Language.php
-languages/LanguageConverter.php
-languages/Names.php
-load.php
-maintenance/commandLine.inc
-maintenance/doMaintenance.php
-maintenance/eval.php
-maintenance/install-utils.inc
-maintenance/Maintenance.php
-opensearch_desc.php
-profileinfo.php
-redirect.php
-resources/Resources.php
-serialized/serialize.php
-skins/MonoBook.deps.php
-skins/MonoBook.php
-skins/Vector.deps.php
-skins/Vector.php
-thumb.php
-trackback.php
diff --git a/maintenance/hiphop/make b/maintenance/hiphop/make
index fdf5e0602e..60388ac081 100755
--- a/maintenance/hiphop/make
+++ b/maintenance/hiphop/make
@@ -40,13 +40,24 @@ class MakeHipHop extends Maintenance {
 			"}\n"
 		);
 
+		# Generate the file list from the autoloader
+		global $wgAutoloadLocalClasses;
+		$files = array_merge(
+			array_values( $wgAutoloadLocalClasses ),
+			array_map( 'trim', file( "$sourceDir/extra-files" ) )
+		);
+		$files = array_unique( $files );
+		file_put_contents(
+			"$buildDir/file-list",
+			implode( "\n", $files ) . "\n" );
+
 		# Generate the C++
 		passthru(
 			'hphp' .
 			' --target=cpp' .
 			' --format=file' .
 			' --input-dir=' . wfEscapeShellArg( $IP ) .
-			' --input-list=' . wfEscapeShellArg( "$sourceDir/file-list.small" ) .
+			' --input-list=' . wfEscapeShellArg( "$buildDir/file-list" ) .
 			' --inputs=' . wfEscapeShellArg( "$buildDir/HipHopCompilerVersion.php" ) .
 			' -c ' . wfEscapeShellArg( "$sourceDir/compiler.conf" ) .
 			' --parse-on-demand=false' .
-- 
2.20.1