Merge pull request #212 from anthonygego/master

Improved package distribution and Windows compilation process

Author: sjrd

CMakeLists.txt

@@ -12,24 +12,36 @@ set(MOZART_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(MOZART_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
 # Some helpers when using MinGW
-
 if(MINGW)
   get_filename_component(CMAKE_MAKE_PROGRAM_PATH "${CMAKE_MAKE_PROGRAM}" PATH)
   get_filename_component(CMAKE_MAKE_PROGRAM_PATH_PARENT "${CMAKE_MAKE_PROGRAM_PATH}" PATH)
 
   set(MINGW_ROOT "${CMAKE_MAKE_PROGRAM_PATH_PARENT}"
       CACHE PATH "Path where MinGW is installed")
-  set(MINGW_COMPILER_VERSION "4.7.2"
+  set(MINGW_COMPILER_VERSION "4.9.1"
       CACHE STRING "Version of GCC in your MinGW installation")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format -Wno-format-extra-args")
-  set(CMAKE_CXX_STANDARD_LIBRARIES "-lwsock32 -lws2_32 ${CMAKE_CSS_STANDARD_LIBRARIES}")
-  set(DEFAULT_MOZART_GENERATOR_FLAGS
-      "-I${MINGW_ROOT}/include/c++/${MINGW_COMPILER_VERSION}"
-      "-I${MINGW_ROOT}/include/c++/${MINGW_COMPILER_VERSION}/i686-pc-mingw32")
+  set(CMAKE_CXX_STANDARD_LIBRARIES "-static -lwsock32 -lws2_32 ${CMAKE_CSS_STANDARD_LIBRARIES}")
+  
+  # Check for gcc target architecture
+  execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine OUTPUT_VARIABLE GCC_ARCH)
+  string(STRIP "${GCC_ARCH}" GCC_ARCH_TRIPLE)
+  message(STATUS "Target architecture : ${GCC_ARCH_TRIPLE}")
 
+  set(DEFAULT_MOZART_GENERATOR_FLAGS
+        "-I${MINGW_ROOT}/${GCC_ARCH_TRIPLE}/include/c++"
+        "-I${MINGW_ROOT}/${GCC_ARCH_TRIPLE}/include/c++/${GCC_ARCH_TRIPLE}"
+        "-I${MINGW_ROOT}/${GCC_ARCH_TRIPLE}/include")  
+  
   set(BOOST_ROOT "${MINGW_ROOT}"
       CACHE PATH "Path where Boost is installed")
+
+  # Configuration for resources files
+    set(CMAKE_RC_COMPILER_INIT windres)
+      enable_language(RC)
+        set(CMAKE_RC_COMPILE_OBJECT
+	    "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
 else()
   set(DEFAULT_MOZART_GENERATOR_FLAGS "")
 endif()
@@ -52,6 +64,11 @@ add_subdirectory(wish)
 add_subdirectory(stdlib)
 add_subdirectory(platform-test)
 
+# Add launcher and icons
+if(UNIX)
+  install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/distrib/share/" DESTINATION share)
+endif()
+
 # General CPack configuration
 
 string(TOLOWER "${CMAKE_SYSTEM_NAME}" MOZART_SYSTEM_NAME)
@@ -86,6 +103,46 @@ string(REGEX REPLACE "-(alpha|beta|rc)\\." "~\\1"
        CPACK_DEBIAN_PACKAGE_VERSION "${MOZART_PROP_OZ_VERSION}")
 set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "tcl8.5, tk8.5, emacs")
+
+# Configuration of the RPM generator
+
+set(CPACK_RPM_PACKAGE_ARCHITECTURE "${MOZART_PROP_PLATFORM_ARCH}")
+set(CPACK_RPM_PACKAGE_REQUIRES "tcl >= 8.5, tk >= 8.5, emacs")
+set(CPACK_RPM_PACKAGE_GROUP "Development/Languages")
+
+# Configuration of Inno Setup files
+
+if(WIN32)
+  find_program(ISS_COMPILER NAMES iscc ISCC
+               HINTS "C:/Program Files (x86)/Inno Setup 5" "C:/Program Files/Inno Setup 5")
+
+  if(NOT ISS_COMPILER)
+    message(WARNING "Inno Setup Compiler not found. You won't be able to build setup files.")
+  else()
+    message(STATUS "Using Inno Setup Compiler from: ${ISS_COMPILER}")
+    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/distrib/windows"
+         DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/distrib")
+
+    # Compute Tcl/Tk install path
+    get_filename_component(ISS_TCL_EXEC_PARENT "${ISS_TCL_EXEC}" DIRECTORY)
+    get_filename_component(ISS_TCL_PATH "${ISS_TCL_EXEC_PARENT}" DIRECTORY)
+
+    # Compute emacs install path
+    get_filename_component(ISS_EMACS_EXEC_PARENT "${ISS_EMACS_EXEC}" DIRECTORY)
+    get_filename_component(ISS_EMACS_PATH "${ISS_EMACS_EXEC_PARENT}" DIRECTORY)
+
+    # Parse Inno Setup config file
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/distrib/windows/MozartConfig.iss"
+                   "${CMAKE_CURRENT_BINARY_DIR}/distrib/windows/MozartConfig.iss")
+
+    # Add installer target
+    add_custom_target(installer
+                      COMMAND ${CMAKE_MAKE_PROGRAM} install
+                      COMMAND ${ISS_COMPILER} "${CMAKE_CURRENT_BINARY_DIR}/distrib/windows/MozartSetup.iss"
+                      VERBATIM)
+  endif()
+endif()
 
 # Finally include CPack
 include(CPack)

README.Windows.md

@@ -1,77 +1,134 @@
 # Windows-specific notes
 
 General information can be found in the [main Readme](README.md). Unless
-othewise specified here, instructions found in the main Readme apply.
-
-## Required software
+otherwise specified here, instructions found in the main Readme apply.
 
+## Global configuration
+### Development tools
 Download and install the following tools:
 
-*   TortoiseSVN and TortoiseGit
-*   The [MinGW distro](http://nuwen.net/mingw.html) of nuwen.net,
-    which includes a C++11 enabled GCC and Boost
+*   Java (required for building the boot compiler)
+*   Python (required for building LLVM)
+*   Git for Windows
 *   CMake >= 2.8.6
-*   Emacs
-*   [Active TCL](http://www.activestate.com/activetcl/downloads)
-    _32 bits_ (even if you are running a 64-bit Windows), preferably v8.5
+*   [Inno Setup](http://www.jrsoftware.org/isdl.php) (with preprocessor, required for building setup files)
+*   A recent 32-bit (i686) or 64-bit (x86_64) targeting [MinGW-64 distro](http://mingw-w64.sourceforge.net/download.php#mingw-builds) with gcc >= 4.7.1. 
 
-We will refer to the installation directories of MinGW, CMake and Emacs by
-`<mingw>`, `<cmake>` and `<emacs>`, respectively.
+These tools won't be needed at run time. We will refer to the installation directory of MinGW (in which the first `bin` subdirectory is found) by `<mingw>`. 
+All commands in this file are to be done in the MinGW terminal (shortcut available from the start menu).
 
-Also, each time we mention "4.7.2", we are referring to the version of GCC
-that accompanies MinGW. Make sure to adapt this to your version.
+### Mozart requirements
+Download and install :
 
-## Global configuration
+*   Emacs for Windows
+*   32-bit or 64-bit (depending on MinGW) [Active Tcl](http://www.activestate.com/activetcl/downloads) or self-compiled Tcl/Tk >= 8.5
+
+We will refer to the installation directory of Emacs and Tcl/Tk by `<emacs>` and `<tcl>`, respectively.
+
+### Suggested directory layout
+
+We suggest that you use the following directory layout, starting from a
+directory `<projects>` :
+
+	<projects>
+	  + mozart2              // cloned from this repo
+	  + externals
+	      + boost            // source of Boost (see below)
+	      + gtest            // source of GTest (see below)
+	      + llvm             // source of LLVM (see below)
+	  + builds
+	      + gtest            // build of GTest
+	      + llvm             // build of LLVM
+	      + mozart2          // build of Mozart
+	  + redist               // export dir of Mozart (see below)
+
+Throughout the following instructions, we will assume this layout.
+
+## Compilation of Boost
+1. Download [Boost **>= 1.53**](http://www.boost.org/users/download/) and extract the archive in `<projects>\externals\boost`.
+1. In your MinGW terminal, type (`<arch>` depends on building 32-bit or 64-bit target) :
+
+		C:> cd <projects>\externals\boost\tools\build\src\engine
+		C:> build.bat mingw
+		C:> cp bin.nt<arch>\*.* ..\..\..\..\
+		C:> cd ..\..\..\..\
+		C:> bjam --toolset=gcc
+
+1. From `<projects>\externals\boost`, copy `boost` subdirectory in your `<mingw>\<arch>-w64-mingw32\include` directory and merge `stage\lib` subdirectory with your `<mingw>\<arch>-w64-mingw32\lib` directory.
+
+## Compilation of GTest
+
+1. Download [GTest](https://code.google.com/p/googletest/downloads/list) and extract the archive in `<projects>\externals\gtest`.
+1. In your MinGW terminal, type :
+
+		C:> cd <projects>\builds\gtest
+		C:> cmake -G"MinGW Makefiles" ..\..\externals\gtest
+		C:> mingw32-make
+
+## Compilation of LLVM
+1. Download [LLVM and Clang **3.3**](http://llvm.org/releases/download.html#3.3) source code.
+1. Extract the content of LLVM source archive in `<projects>\externals\llvm` and the content of Clang source archive in `<projects>\externals\llvm\tools\clang`.
+1. If you are targeting 64-bit builds, patch the files `<projects>\externals\llvm\lib\ExecutionEngine\JIT\JIT.cpp` and `<projects>\externals\llvm\lib\ExecutionEngine\MCJIT\SectionMemoryManager.cpp` by replacing :
+
+    	// Determine whether we can register EH tables.
+		#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \
+		     !defined(__USING_SJLJ_EXCEPTIONS__))
+		#define HAVE_EHTABLE_SUPPORT 1
+		#else
+		#define HAVE_EHTABLE_SUPPORT 0
+		#endif
+
+	by :
 
-Put the following directories in your PATH:
+    	// Determine whether we can register EH tables.
+		#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \
+		     !(defined(__USING_SJLJ_EXCEPTIONS__) || defined(_WIN64)))
+		#define HAVE_EHTABLE_SUPPORT 1
+		#else
+		#define HAVE_EHTABLE_SUPPORT 0
+		#endif
 
-*    `<mingw>\bin`
-*    `<cmake>\bin`
-*    `<emacs>\bin`
-*    `<projects>\builds\llvm-release\bin`
+1. In your MinGW terminal, type :
 
-Patch the file `<mingw>\include\c++\4.7.2\i686-pc-mingw32\bits\c++config.h` by
-replacing
+		C:> cd <projects>\builds\llvm
+		C:> cmake -G"MinGW Makefiles" -DLLVM_TARGETS_TO_BUILD="X86" -DCMAKE_BUILD_TYPE=Release ..\..\externals\llvm
+		C:> mingw32-make
 
-    /* Define if __float128 is supported on this host. */
-    #define _GLIBCXX_USE_FLOAT128 1
+## Compilation of Mozart 2
+1. In your MinGW terminal, type :
 
-by
+		C:> set PATH=%PATH%;<projects>\builds\llvm\bin;<emacs>\bin;<tcl>\bin
+		C:> cd <projects>
+		C:> git clone --recursive https://github.com/mozart/mozart2.git
+		C:> cd <projects>\builds\mozart2
+		C:> cmake -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DLLVM_BUILD_DIR=..\llvm -DGTEST_BUILD_DIR=..\gtest -DGTEST_SRC_DIR=..\..\externals\gtest -DLLVM_SRC_DIR=..\..\externals\llvm -DBOOST_ROOT=..\..\externals\boost\  -DCMAKE_INSTALL_PREFIX=..\..\redist\ ..\..\mozart2
+		C:> mingw32-make
 
-    /* Define if __float128 is supported on this host. */
-    #ifndef __clang__
-    #define _GLIBCXX_USE_FLOAT128 1
-    #endif
+	If the script does not detect correctly where MinGW is installed, you can tell
+	it using the option `-DMINGW_ROOT=<mingw>`. Similarly, if the version of GCC in
+	your MinGW is not 4.9.1, you can tell it with
+	`-DMINGW_COMPILER_VERSION=4.8.2`, e.g.
 
-## GTest and LLVM
+1. To copy all the binaries in the `redist` folder, type :	
 
-Download them as specified in the main Readme.
+		C:> mingw32-make install
 
-Configure and build GTest:
+## Running Mozart 2
 
-    gtest-debug>cmake -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=<mingw>/bin/make.exe -DCMAKE_BUILD_TYPE=Debug ../../externals/gtest
-    gtest-debug>make
+For Mozart to run properly, you need to ensure :
 
-Configure and build LLVM with:
+* Tcl/Tk is in your PATH or its `lib` and `bin` subfolders are merged with Mozart ones
+* An environment variable `OZEMACS` is set to `<emacs>\bin\runemacs.exe`
 
-    llvm-release>cmake -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=<mingw>/bin/make.exe -DCMAKE_BUILD_TYPE=Release ../../externals/llvm
-    llvm-release>make
+## Making Mozart 2 packages
 
-## Configuration and build of Mozart2
+If you want to build setup files for Mozart, just type in your terminal :
 
-The "build" version (not "installed") of Mozart2 is very tedious to run on
-Windows. We suggest that you always `make install` (we do that ourselves).
-You can use the configuration option `-DCMAKE_INSTALL_PREFIX=C:/Where/You/Want`
-of CMake to specify in which directory you want it to be installed.
+    C:> mingw32-make installer
 
-Configure and build Mozart with the following incantation. It might be
-necessary to open your command prompt with administrator privileges.
+The new setup file will be located in your build directory. Two more CMake options are then available :
 
-    mozart2-release>cmake -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=<mingw>/bin/make.exe -DCMAKE_BUILD_TYPE=Release -DGTEST_SRC_DIR=../../externals/gtest -DGTEST_BUILD_DIR=../gtest-debug -DLLVM_SRC_DIR=../../externals/llvm -DLLVM_BUILD_DIR=../llvm-release ../../mozart2
-    mozart2-release>make
-    mozart2-release>make install
+* `-DISS_INCLUDE_EMACS=ON` will include your Emacs files in the package.
+* `-DISS_INCLUDE_TCL=ON` will include your Tcl/Tk files in the package.
 
-If the script does not detect correctly where MinGW is installed, you can tell
-it using the option `-DMINGW_ROOT=<mingw>`. Similarly, if the version of GCC in
-your MinGW is not 4.7.2, you can tell it with
-`-DMINGW_COMPILER_VERSION=4.7.1`, e.g.
+Please note that ActiveTcl is not redistributable without an OEM license.

boosthost/emulator/emulator.cc

@@ -162,7 +162,11 @@ int main(int argc, char** argv) {
   std::string ozSearchPath, ozSearchLoad, appURL;
   std::vector<std::string> appArgs;
   size_t minMemoryMega = 32;
+#if defined(_WIN32) && !defined(_WIN64)
+  size_t maxMemoryMega = 512;
+#else
   size_t maxMemoryMega = 768;
+#endif
   bool appGUI;
 
   // DEFINE OPTIONS

distrib/share/applications/oz.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Mozart Programming System
+Exec=oz %u
+Terminal=false
+Type=Application
+Icon=oz
+Categories=Development;