Preparing release 3.1.0 Beta 1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index def7a2ca6af2bb9493ea2480ab8560cc91ad10d1..132e02ae1a59d7053be937db8b9e96f22504a2a4 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
-               <version>3.1.0 Alpha 4</version> <!-- codename: tornado -->
-               <date>2017-09-19</date>
+               <version>3.1.0 Beta 1</version> <!-- codename: tornado -->
+               <date>2017-09-27</date>
        </packageinformation>
        
        <authorinformation>
@@ -48,60 +48,13 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <!--
-       <instructions type="update" fromversion="3.0.8">
-               <instruction type="acpTemplate" />
-               <instruction type="template" />
-               
-               <instruction type="file">files_pre_sql.tar</instruction>
-               
-               <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_addColumn.php</instruction>
-               
-               <instruction type="sql" run="standalone">update_3.1_1.sql</instruction>
-               <instruction type="sql" run="standalone">update_3.1_2.sql</instruction>
-               <instruction type="sql" run="standalone">update_3.1_3.sql</instruction>
-               <instruction type="sql" run="standalone">update_3.1_4.sql</instruction>
-               
-               <instruction type="file" run="standalone" />
-               
-               <instruction type="language" run="standalone" />
-               
-               <instruction type="acpMenu" />
-               <instruction type="bbcode" />
-               <instruction type="clipboardAction" />
-               <instruction type="cronjob" />
-               <instruction type="eventListener" />
-               <instruction type="objectTypeDefinition" />
-               <instruction type="objectType" />
-               <instruction type="option" run="standalone" />
-               <instruction type="userGroupOption" />
-               <instruction type="userNotificationEvent" />
-               <instruction type="userOption" />
-               
-               <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_pageSearchIndex.php</instruction>
-               
-               <instruction type="page" />
-       -->
-               <!-- contains a reference to a new page -->
-       <!--
-               <instruction type="menuItem" />
-               
-               <instruction type="packageInstallationPlugin" />
-       -->     <!-- new pip -->
-       <!--
-               <instruction type="mediaProvider" />
-               
-               <instruction type="style">defaultStyle.tar</instruction>
-               
-               <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_postUpgrade.php</instruction>
-       </instructions>
-       -->
-       
-       <instructions type="update" fromversion="3.1.0 Alpha 3">
+       <instructions type="update" fromversion="3.1.0 Alpha 4">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
+               <instruction type="sql">update_3.1.0_beta_1.sql</instruction>
+               
                <instruction type="language" />
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_3.1.0_alpha_2.sql b/com.woltlab.wcf/update_3.1.0_alpha_2.sql
deleted file mode 100644 (file)
index e5a28a5..0000000
--- a/com.woltlab.wcf/update_3.1.0_alpha_2.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE wcf1_event_listener CHANGE eventClassName eventClassName VARCHAR(255) NOT NULL DEFAULT '';

diff --git a/com.woltlab.wcf/update_3.1.0_beta_1.sql b/com.woltlab.wcf/update_3.1.0_beta_1.sql
new file mode 100644 (file)
index 0000000..dd70dc7
--- /dev/null
+++ b/com.woltlab.wcf/update_3.1.0_beta_1.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS wcf1_package_compatibility;
+CREATE TABLE wcf1_package_compatibility (
+       packageID INT(10) NOT NULL,
+       version SMALLINT(4) NOT NULL,
+       UNIQUE KEY compatibleVersion (packageID, version)
+);
+
+DROP TABLE IF EXISTS wcf1_package_update_compatibility;
+CREATE TABLE wcf1_package_update_compatibility (
+       packageUpdateVersionID INT(10) NOT NULL,
+       version SMALLINT(4) NOT NULL,
+       UNIQUE KEY compatibleVersion (packageUpdateVersionID, version)
+);
+
+ALTER TABLE wcf1_package_compatibility ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE;
+
+ALTER TABLE wcf1_package_update_compatibility ADD FOREIGN KEY (packageUpdateVersionID) REFERENCES wcf1_package_update_version (packageUpdateVersionID) ON DELETE CASCADE;
+
+INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://update.woltlab.com/tornado/', 'online', 0, NULL, 0, '', '');
+INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://store.woltlab.com/tornado/', 'online', 0, NULL, 0, '', '');

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 0144814d02d8b4b9223c908d14f2faedc41ba984..521453d2aa9b1886800e3d2bb5259275cbd7addc 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -47,7 +47,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.0 Alpha 4');
+define('WCF_VERSION', '3.1.0 Beta 1');
 
 // define current API version
 define('WSC_API_VERSION', 2018);