arokem · jjangsangy · Mar 25, 2015 · Mar 25, 2015 · Mar 26, 2015 · Mar 26, 2015
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ rebuildTags.sh
 
 # caused py setup.py develop
 pymatbridge.egg-info
+
+.idea/scopes/scope_settings.xml
diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,33 @@
+Pymatbridge
+===========
+
+A python interface to call out to Matlab(R).
+
+
+License information
+===================
+
+Copyright (c) 2012 -- , Max Jaderberg, Ariel Rokem, Haoxing Zhao
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+Neither the name of the Oxford University, Stanford University nor the names of
+its contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 Copyright (c) 2013. See "Contributors". MATLAB (R) is copyright of the Mathworks. 
 
 All rights reserved.

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,24 @@
+include LICENSE
+include config.ini
+include README.md
+include requirements.txt
+include setup.cfg
+include scripts/publish-notebook
+
+include pymatbridge/messenger/src/messenger.c
+
+include pymatbridge/messenger/mexa64/*
+include pymatbridge/messenger/mexmaci64/*
+include pymatbridge/messenger/mexw64/*
+include pymatbridge/messenger/mexa64/*
+
+include pymatbridge/matlab/messenger.mex
+include pymatbridge/matlab/messenger.mex.zmq3
+include pymatbridge/matlab/messenger.mexmaci64
+include pymatbridge/matlab/messenger.mexmaci64.zmq3
+include pymatbridge/matlab/util/json_v0.2.2/json/java/json.jar
+include pymatbridge/matlab/util/json_v0.2.2/LICENSE
+
+recursive-include pymatbridge *.py *.ipynb *.m
+recursive-include scripts *
+recursive-include tools *
diff --git a/config.ini b/config.ini
@@ -0,0 +1,20 @@
+[Darwin]
+; MATLAB_BIN=Applications/MATLAB_R2014a.app/bin
+OCTAVE_INC=/usr/local/Cellar/octave/3.8.2/include/octave-3.8.2/octave
+OCTAVE_LIB=/usr/local/Cellar/octave/3.8.2/lib/octave/3.8.2
+ZMQ_INC=/usr/local/include
+ZMQ_LIB=/usr/local/lib
+
+[Windows]
+; MATLAB_BIN=C:\Program Files\MATLAB\R2014b\bin
+; OCTAVE_INC=C:\Octave\Octave-3.8.2\include\octave-3.8.2\octave
+; OCTAVE_LIB=C:\Octave\Octave-3.8.2\lib\octave\3.8.2
+ZMQ_INC=C:/Program Files/ZeroMQ 4.0.4/include
+ZMQ_LIB=C:/Program Files/ZeroMQ 4.0.4/lib
+
+[Linux]
+; MATLAB_BIN=/usr/local/bin
+; OCTAVE_INC=/usr/include
+; OCTAVE_LIB=/usr/lib/x86_64-linux-gnu/
+ZMQ_INC=
+ZMQ_LIB=
diff --git a/messenger/__init__.py b/messenger/__init__.py
diff --git a/messenger/make.py b/messenger/make.py
diff --git a/messenger/mexa64/local.cfg b/messenger/mexa64/local.cfg
diff --git a/messenger/mexmaci64/local.cfg b/messenger/mexmaci64/local.cfg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ rebuildTags.sh

		# caused py setup.py develop
		pymatbridge.egg-info

		.idea/scopes/scope_settings.xml