fix

Author: skaller

Diff for: .travis.yml

@@ -25,7 +25,7 @@ before_deploy:
 - cp installscript/posixinstall.sh linuxinstall.sh 
 - cp installscript/linuxsetup.sh .
 - cp installscript/linuxREADME.txt .
-- tar -czvf felix-linux.tgz build/release/host build/release/share linuxinstall.sh linuxsetup.sh hello.flx
+- tar -czvf felix-linux.tgz build/release/host build/release/share linuxinstall.sh linuxsetup.sh hello.flx INSTALL
 
 deploy:
   provider: releases

Diff for: INSTALL

@@ -1,108 +1,51 @@
-Installing Felix: POSIX (UNIX, OSX, LINUX, etc)
-===============================================
+INSTALLING FELIX from BINARY PACKAGE
+====================================
 
-Requirements
+Linux 64 bit
 ------------
-* OCaml >= 3.11
-* Python >= 3.1
-* C++ compiler (clang, gcc, msvc++)
 
-Optional
---------
-SDL
-ZMQ
-libxml2
+Felix installs in /usr/local/lib/felix/felix-${FLX_VERSION} where
+FLX_VERSION is the Felix version number, of the form YYYY.MM.DD.
+It is configured for gcc and built with gcc-5.1. C++11 support 
+is required. 
 
-Build
------
-
-make build
-
-Test
-----
-
-make test
+Use:
 
-Docs
-----
+sudo ./posixinstall.sh
 
-make doc
+to install. Any previous install is deleted. To use:
 
-Install
--------
+./linuxsetup.sh
 
-make install
+Test with:
 
-You will need to put a sudo password.
+flx hello
 
-Installing Felix: POSIX (BSD)
-===============================================
 
-Requirements Base
------------------
-* C++ compiler (clang, gcc)
-
-Requirements Ports
-------------------
-* lang/ocaml  >= 3.11
-* lang/python32 || lang/python31 (Python >= 3.1)
-* databases/sqlite3 
-* ports-mgmt/portconf
-* databases/py-sqlite3
-  ** special instructions **
-  The py-sqlite3 port by default targets Python2 inorder to build for 
-  python3 ports-mgmt/portconf must be installed and the file: 
-   /usr/local/etc/ports.conf must exist and contain:
-     databases/py-sqlite3: PYTHON_VERSION=python3.2
-
-Optional Ports
---------------
-devel/sdl
-devel/zmq
-textproc/libxml2
-databases/postgresql83-client or greater
-
-Build
+OSX
 -----
-gmake build
-
-Test
-----
-gmake test
-
-Docs
-----
-gmake doc
 
-Install
--------
-gmake install
-
-WINDOWS: MSVC++
-================
-
-Ask for help on the mailing list. 
+There is currenly no binary for OSX. Please build from source.
 
+Windows 64 bit
+--------------
 
-You WILL need a few basic unix tools for Windows
-like make, cp, etc.
+Felix installs in C:\usr\local\lib\felix\felix-${FLX_VERSION} where
+FLX_VERSION is the Felix version number, of the form YYYY.MM.DD.
+It is configured for MSVC++ and built with Visual Studio 14 (2015). 
+It is a 64 bit debugging version.  C++11 support  is required. 
+Type:
 
-The build system should
-more or less work out of the box up to installation,
-provided you have Ocaml built with MSVC++, Python built with MSVC++,
-and you have MSVC++ environment set up.
+win32install.bat
 
-You should set HOME environment variable to mirror the Unix 
-system setup. You should install Felix in 
+to install. Any previous install is deleted. To use,
+open a Visual Studio command prompt for x64 or x86->x64
+cross compiler. Type:
 
-  c:\usr\local\lib
+win32setup.bat
 
-just like on Unix.
+Test with:
 
-Windows: other
-==============
+flx hello
 
-It should be possible to build Felix for Cygwin,
-MSYS or other Windows setup but it may take a bit
-of fiddling to make this work!
 

Diff for: appveyor.yml

@@ -23,8 +23,7 @@ build_script:
 after_build:
   - copy installscript\win32install.bat .
   - copy installscript\win32setup.bat .
-  - copy installscript\win32README.bat .
-  - 7z a felix-win64.zip build\release\share build\release\host win32install.bat win32setup.bat hello.flx
+  - 7z a felix-win64.zip build\release\share build\release\host win32install.bat win32setup.bat hello.flx INSTALL
 
 artifacts:
   - path: felix-win64.zip