Revert "Remove the preliminary upgrade instructions from 5.5"

This reverts commit b600a2611491aa9c16891d2c5ffbdc1a005591c9.

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index a3a247aa051098c4d37638908faf3bbfa7596d17..b1b5344a65193501ebc90e463f6d77258a7c8c1a 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -50,6 +50,85 @@
                <instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
        </instructions>
 
+       <instructions type="update" fromversion="5.5.*">
+               <!--
+tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
+       acp/update_com.woltlab.wcf_6.0_checkSystemRequirements.php \
+       acp/update_com.woltlab.wcf_6.0_checkCache.php \
+       acp/update_com.woltlab.wcf_6.0_checkAttachmentStorage.php \
+       acp/update_com.woltlab.wcf_6.0_checkForMultiDomainSetup.php \
+       acp/database/update_com.woltlab.wcf_6.0_pre.php \
+       acp/update_com.woltlab.wcf_6.0_checkUpdateServers.php
+               -->
+               <instruction type="file" run="standalone">files_pre_check.tar</instruction>
+
+               <!-- Checks that need to happen before the upgrade starts. -->
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_checkSystemRequirements.php</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_checkCache.php</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_checkAttachmentStorage.php</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_checkForMultiDomainSetup.php</instruction>
+               <!--instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_checkUpdateServers.php</instruction-->
+
+               <!-- Required for wcf1_package_installation_file_log. -->
+               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_pre.php</instruction>
+
+               <!-- Deploy new application code. -->
+               <instruction type="file" />
+               <instruction type="acpTemplate" />
+               <instruction type="template" />
+
+               <!-- Make all the new options available as early as possible. -->
+               <instruction type="option" run="standalone" />
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_skipFirstTimeSetup.php</instruction>
+
+               <!-- Run before the database migrations, because the data is gone otherwise. -->
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_landingPage.php</instruction>
+
+               <!-- Run before the database migrations, because otherwise the migration fails. -->
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_articleOrphans.php</instruction>
+
+               <!-- Migrate the database as early as possible. -->
+               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_reaction_fk_step1.php</instruction>
+               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_reaction_fk_step2.php</instruction>
+
+               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0.php</instruction>
+
+               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_trackedVisit_step1.php</instruction>
+               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_trackedVisit_step2.php</instruction>
+               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_trackedVisit_step3.php</instruction>
+
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_styleVariables.php</instruction>
+
+               <!-- Deploy the new application code again to build the hashes in wcf1_package_installation_file_log. -->
+               <instruction type="file" />
+
+               <!-- Misc. PIPs. -->
+               <instruction type="acpMenu" />
+               <instruction type="bbcode" />
+               <instruction type="coreObject" />
+               <instruction type="cronjob" />
+               <instruction type="eventListener" />
+               <instruction type="language" />
+               <instruction type="mediaProvider" />
+               <instruction type="objectType" />
+               <instruction type="page" />
+               <instruction type="smiley" />
+               <instruction type="userGroupOption" />
+               <instruction type="userMenu" />
+               <instruction type="userOption" />
+
+               <instruction type="style">defaultStyle.tar</instruction>
+
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_favicon.php</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_trophies.php</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_removeDownloadedGravatars.php</instruction>
+
+               <!-- Clean Up. -->
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_removeLegacyAppConfig.php</instruction>
+               <instruction type="fileDelete" />
+               <instruction type="templateDelete" />
+       </instructions>
+
        <instructions type="update" fromversion="6.0.0 Beta 3">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>