Merge pull request #1066 from JimMarlowe/JM-LINUX-PKG2

linux package cleanup

Build/Linux/DEBIAN/control

@@ -1,4 +1,4 @@
-Package: AtomicGameEngine
+Package: atomicgameengine
 Version: 0.0.8
 Installed-Size: 401932
 Section: devel
@@ -6,9 +6,8 @@ Maintainer: info <[email protected]>
 Homepage: http://atomicgameengine.com
 Priority: optional
 Architecture: amd64
-Depends: libgtk-3-0 (>=3.10.7), libx11-6 (>=2:1.6.2), libglib2.0-0 (>=2.40.2), libgcc1 (>=1:4.9.3), libc6 (>=2.19)
-Recommends: libgl1-mesa-glx (>=10.1.3)
-Description: The Atomic Game Engine is a cross-platform game editor
- The Atomic Game Engine features a cross-platform editor with deployment to Windows, OSX, Linux, WebGL, Android, and iOS. Applications can be built using JavaScript, TypeScript, native C++, and C#. The Atomic Game Engine is a full source solution under the permissive MIT License on GitHub
- (C) 2016 THUNDERBEAST GAMES, LLC
+Depends: libgtk-3-0, libx11-6, libglib2.0-0, libgcc1, libc6
+Recommends: libgl1-mesa-glx
+Description: Atomic Game Engine is a cross-platform game editor
+ The Atomic Game Engine features a cross-platform editor with deployment to Windows, OSX, Linux, WebGL, Android, and iOS. Applications can be built using JavaScript, TypeScript, native C++, and C#. The Atomic Game Engine is a full source solution under the permissive MIT License on GitHub. (C) 2016 THUNDERBEAST GAMES, LLC
 

Build/Linux/DEBIAN/postinst

@@ -1,6 +1,8 @@
 #! /bin/bash -e
-ln -fs "/usr/share/AtomicGameEngine/AtomicEditor" "/usr/bin/AtomicEditor"
-ln -fs "/usr/share/AtomicGameEngine/atomic_menu.xpm" "/usr/share/pixmaps/atomic_menu.xpm"
+ln -fs "/usr/share/atomicgameengine/AtomicEditor" "/usr/bin/AtomicEditor"
+ln -fs "/usr/share/atomicgameengine/atomic_menu.xpm" "/usr/share/pixmaps/atomic_menu.xpm"
 # hack for some window managers
-mv "/usr/share/applications/Atomic_Game_Engine.desktop" "/tmp/Atomic_Game_Engine.desktop"
-mv "/tmp/Atomic_Game_Engine.desktop" "/usr/share/applications/Atomic_Game_Engine.desktop"
+temp_file=$(mktemp)
+mv "/usr/share/applications/Atomic_Game_Engine.desktop" ${temp_file}
+mv ${temp_file} "/usr/share/applications/Atomic_Game_Engine.desktop"
+

Build/Linux/usr/share/doc/AtomicGameEngine/copyright

@@ -1,20 +0,0 @@
-Copyright (c) 2014-2016 THUNDERBEAST GAMES LLC  
-https://github.com/AtomicGameEngine/AtomicGameEngine
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

Build/Scripts/PackageEditor.js

@@ -102,13 +102,11 @@ namespace('package', function() {
         async: true
     }, function() {
 
-        // check if all the commands exist : fakeroot, dpkg-deb
-
         var editorAppFolder = config.editorAppFolder;
         var srcDir = config.artifactsRoot + "AtomicEditor/";
         var dstDir = config.artifactsRoot + "Dist/";
-        var dstDeb = config.artifactsRoot + "AtomicGameEngine_0.0.8_amd64.deb";
-        
+        var dstDeb = config.artifactsRoot + "AtomicEditor_LINUX_" + config.buildSHA + ".deb";
+
         host.cleanCreateDir(dstDir);  // create new staging directory
         fs.removeSync(dstDeb);  // remove old one, if there
         
@@ -117,32 +115,32 @@ namespace('package', function() {
         fs.copySync(config.atomicRoot + "Build/Linux/usr", dstDir + "usr" );
 
         // copy in the atomic dir
-        fs.copySync(editorAppFolder, dstDir + "usr/share/AtomicGameEngine" );
+        fs.copySync(editorAppFolder, dstDir + "usr/share/atomicgameengine" );
        
         //copy in menu pixmap
-        fs.copySync(config.atomicRoot + "Build/Linux/atomic_menu.xpm", dstDir + "usr/share/AtomicGameEngine/atomic_menu.xpm" );
-        
-        // get rid of some lintian errors
-        fs.removeSync( dstDir + "usr/share/AtomicGameEngine/Resources/ToolData/.gitignore");
-        fs.removeSync( dstDir + "usr/share/AtomicGameEngine/Resources/ToolData/CodeEditor/.gitignore");
-        fs.removeSync( dstDir + "usr/share/AtomicGameEngine/Resources/ToolData/Deployment/Android/assets/.gitignore");
-        fs.removeSync( dstDir + "usr/share/AtomicGameEngine/Resources/ToolData/ProjectTemplates/.gitignore");
-        fs.removeSync( dstDir + "usr/share/AtomicGameEngine/Resources/ToolData/TypeScriptSupport/.gitignore");
+        fs.copySync(config.atomicRoot + "Build/Linux/atomic_menu.xpm", dstDir + "usr/share/atomicgameengine/atomic_menu.xpm" );
+
+        //copy in copyright
+        fs.copySync(config.atomicRoot + "LICENSE.md", dstDir + "usr/share/doc/atomicgameengine/copyright" );
 
         cmds = [];
         
         // go to staging root directory
         cmds.push("cd " + config.artifactsRoot + " ;" );
         
-        // get rid of some more lintian errors
-        cmds.push("/usr/bin/strip --strip-unneeded " + dstDir + "usr/share/AtomicGameEngine/AtomicEditor ;" );
-        cmds.push("/usr/bin/strip --strip-unneeded " + dstDir + "usr/share/AtomicGameEngine/Resources/ToolData/Deployment/Linux/AtomicPlayer ;" );
-        cmds.push("/bin/chmod oug-wx " + dstDir + "usr/share/AtomicGameEngine/libcef.so ;");
-
+        // get rid of some lintian errors
+        cmds.push("find " + dstDir + "usr/share/atomicgameengine/ -name .gitignore -type f -delete ;");
+        cmds.push("find " + dstDir + "usr/share/atomicgameengine/ -maxdepth 9 -type f -print0 | xargs -0 chmod oug-x ;");
+        cmds.push("/bin/chmod oug+x " + dstDir + "usr/share/atomicgameengine/AtomicEditor ;");
+        cmds.push("/bin/chmod oug+x " + dstDir + "usr/share/atomicgameengine/Resources/ToolData/Deployment/Linux/AtomicPlayer ;" );
+        cmds.push("/usr/bin/strip --strip-unneeded " + dstDir + "usr/share/atomicgameengine/AtomicEditor ;" );
+        cmds.push("/usr/bin/strip --strip-unneeded " + dstDir + "usr/share/atomicgameengine/Resources/ToolData/Deployment/Linux/AtomicPlayer ;" );
+
+        // create the package
         // needs fakeroot for package file ownership issues
         cmds.push("/usr/bin/fakeroot /usr/bin/dpkg-deb --build " + dstDir + ";");
 
-        // fix the deb name
+        // change the deb name, following Atomic standards
         cmds.push("/bin/mv " + config.artifactsRoot + "Dist.deb " + dstDeb + " ;");
 
         // clean up the staging area