MISC - deleting clib build from windows Makefile

satra · Jul 25, 2010 · b499f4c · b499f4c
1 parent add6af3
commit b499f4c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
 *.kpf
 *-stamp
-*/*/*-stamp
 build
 *.swp
 *.pyc
 *.pyo
-nifti/_clib.so
-nifti/clib.py
+nibabel.egg-info/
diff --git a/Makefile.win b/Makefile.win
@@ -1,55 +1,23 @@
-# Makefile to build NiBabel under Windows using a standard Python
-# distribution and MinGW
-#
-# Adjust this path to match the version and location of your Python
-# installation
-PYTHON_VERSION=2.5
-PYTHON_PATH=C:\\Python25
-
-#
-# Building
-#
-
-all: build configure-inplace-use
-
-# build included 3rd party pieces (if present)
-3rd: 3rd-stamp
-3rd-stamp:
-	cd 3rd\nifticlibs & $(MAKE) -f Makefile.win
+# Makefile NiBabel under Windows using a standard Python distribution
 
-
-build: 3rd build-stamp
-build-stamp:
-	set PYTHON_INCLUDE="$(PYTHON_PATH)\\include" \
-		& python setup.py build_ext -c mingw32
-
-
-installer: 3rd build
-# now build the installer
+installer: 
+	# now the installer
 	python setup.py bdist_wininst
 
-
-configure-inplace-use:
-	copy build\\lib.win32-$(PYTHON_VERSION)\\nifti\\_clib.pyd \
-		nifti
-
 #
 # Cleaning
 #
 
 clean:
-	-rmdir /S /Q build
+	-rmdir /S /Q
 	-del /S *.a *.o *.gch *.pyd
 
 #
 # Testing
 #
 
-ut-%: build configure-inplace-use
-	@set PYTHONPATH=$(CURDIR) & cd tests & python test_$*.py
-
-unittest: build configure-inplace-use
-	@set PYTHONPATH=$(CURDIR) & cd tests & python main.py
+unittest:
+	@set PYTHONPATH=$(CURDIR) & nosetests nibabel
 
 
 #

diff --git a/doc/source/installation.rst b/doc/source/installation.rst
@@ -7,15 +7,17 @@
   #
   ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ###
 
+.. XXX Package links and build instructions still nifti XXX
+
 .. _installation:
 
 ************
 Installation
 ************
 
-It should be easy to get NiBabel running on any system. For the most
-popular platforms and operating systems there are binary packages provided in
-the respective native packaging format (DEB, RPM or installers). On all other
+It should be easy to get NiBabel running on any system. For the most popular
+platforms and operating systems there are binary packages provided in the
+respective native packaging format (DEB, RPM or installers). On all other
 systems NiBabel has to be compiled from source -- which should also be pretty
 straightforward.
 
@@ -62,10 +64,10 @@ Additionally, there are binary packages for several RPM-based distributions,
 provided through the `OpenSUSE Build Service`_. To install one of these
 packages first download it from the `OpenSUSE software website`_. Please note,
 that this site does not only offer OpenSUSE packages, but also binaries for
-other distributions, including: CentOS 5, Fedora 9-10, Mandriva 2007-2008, RedHat
-Enterprise Linux 5, SUSE Linux Enterprise 10, OpenSUSE 10.2 up to 11.0.  Once
-downloaded, open a console and invoke (the example command refers to NiBabel
-0.3.1)::
+other distributions, including: CentOS 5, Fedora 9-10, Mandriva 2007-2008,
+RedHat Enterprise Linux 5, SUSE Linux Enterprise 10, OpenSUSE 10.2 up to 11.0.
+Once downloaded, open a console and invoke (the example command refers to
+NiBabel 0.3.1)::
 
   rpm -i python-nifti-0.20080710.1-4.1.i386.rpm
 

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 from distutils.core import setup
 
 # For some commands, use setuptools.  
-if len(set(('develop', 'bdist_egg', 'bdist_rpm', 'bdist', 'bdist_dumb', 
+if len(set(('develop', 'bdist_egg', 'bdist_rpm', 'bdist', 'bdist_dumb',
             'bdist_wininst', 'install_egg_info', 'egg_info', 'easy_install',
             )).intersection(sys.argv)) > 0:
     # setup_egg imports setuptools setup, thus monkeypatching distutils. 
@@ -33,22 +33,22 @@
 
 def main(**extra_args):
     setup(name       = 'nibabel',
-        version      = '1.0.0',
-        author       = 'Matthew Brett and Michael Hanke',
-        author_email = 'NiBabel List <[email protected]>',
-        license      = 'MIT License',
-        url          = 'http://niftilib.sf.net/pynifti',
-        description  = 'Access a multitude of neuroimaging data formats',
-        long_description = "",
-        packages     = ['nibabel',
-                        'nibabel.externals',
-                        'nibabel.testing',
-                        'nibabel.tests'],
-        data_files   = [('nibabel/tests/data',
-                         glob(os.path.join('nibabel', 'tests', 'data', '*')))],
-        scripts      = [os.path.join('bin', 'parrec2nii')],
-        **extra_args
-        )
+          version      = '1.0.0',
+          author       = 'Matthew Brett and Michael Hanke',
+          author_email = 'NiBabel List <[email protected]>',
+          license      = 'MIT License',
+          url          = 'http://niftilib.sf.net/pynifti',
+          description  = 'Access a multitude of neuroimaging data formats',
+          long_description = "",
+          packages     = ['nibabel',
+                          'nibabel.externals',
+                          'nibabel.testing',
+                          'nibabel.tests'],
+          data_files   = [('nibabel/tests/data',
+                           glob(os.path.join('nibabel', 'tests', 'data', '*')))],
+          scripts      = [os.path.join('bin', 'parrec2nii')],
+          **extra_args
+         )
 
 
 if __name__ == "__main__":