[Pkg-javascript-commits] [node-expat] 190/371: remove legacy windows build stuff
Jonas Smedegaard
dr at jones.dk
Sun Feb 28 10:00:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository node-expat.
commit 08d55f27eac9659969c547e492c16c5e215a1008
Author: Nathan Rajlich <nathan at tootallnate.net>
Date: Fri Sep 28 23:42:57 2012 -0700
remove legacy windows build stuff
We're going to make it work even better, and this didn't work anymore anyways...
---
tools/Readme.txt | 13 ---------
tools/module.gyp | 75 -----------------------------------------------
tools/node-gyp | 33 ---------------------
tools/node-gyp.bat | 85 ------------------------------------------------------
4 files changed, 206 deletions(-)
diff --git a/tools/Readme.txt b/tools/Readme.txt
deleted file mode 100644
index 6358bb2..0000000
--- a/tools/Readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-This modules requires the expat library. You may download installation files from:
-http://sourceforge.net/projects/expat/files/expat_win32/
-
-The provided script (node-gyp.bat) requires two environment variables in order to run properly:
-NODE_ROOT: Points to the root of the Node's git repo. Download node from git (https://github.com/joyent/node) and build it using the vcbuild.bat script.
-EXPAT_ROOT: The root installation folder of EXPAT so that the script can locate %EXPAT_ROOT%\Source\lib\expat.h.
-
-To generate a visual studio 2010 project run
-node-gyp.bat
-If you want to generate the project and build it at once do:
-node-gyp.bat make
-
-
\ No newline at end of file
diff --git a/tools/module.gyp b/tools/module.gyp
deleted file mode 100644
index 0189e4e..0000000
--- a/tools/module.gyp
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- 'variables': {
- 'module_name': 'node_expat',#Specify the module name here
- 'library': 'shared_library', #This gypi file is about modules so everything is shared_library
- 'target_arch': 'ia32', #The architecture is hardcoded because of a i386 harcoded element in the gyp make.py file
- 'output_directory': '../build/Release', #The output dir resembles the old node-waf output in order to keep the olde references
- },
- 'targets': [
- {
- #Needed declarations for the target
- 'target_name': '<(module_name)',
- 'type': '<(library)',
- 'product_name':'<(module_name)',
- 'product_extension':'node',
- 'product_dir':'<(output_directory)',
- 'product_prefix':'',#remove the default lib prefix on each library
-
- 'sources': [
- '../node-expat.cc',
- ],
-
- 'include_dirs': [
- '<(NODE_ROOT)/src',
- '<(NODE_ROOT)/deps/v8/include',
- '<(NODE_ROOT)/deps/uv/include',
- '<(expat_root)/Source/lib',
- ],
-
- 'defines': [
- 'ARCH="<(target_arch)"',
- 'PLATFORM="<(OS)"',
- '_LARGEFILE_SOURCE',
- '_FILE_OFFSET_BITS=64',
- ],
-
- 'conditions': [
- [ 'OS=="win"', {
- 'defines': [
- 'uint=unsigned int', #Windows doesn't have uint defined
- # we need to use node's preferred "win32" rather than gyp's preferred "win"
- 'PLATFORM="win32"',
- ],
- #we need to link to the node.lib file
- 'libraries': [ '-l<(NODE_ROOT)/<(node_lib_folder)/node.lib','-l<(expat_root)/bin/libexpat.lib' ],
- 'msvs_configuration_attributes': {
- 'OutputDirectory': '<(output_directory)',
- 'IntermediateDirectory': '<(output_directory)/obj',
- },
- 'msvs-settings': {
- 'VCLinkerTool': {
- 'SubSystem': 3, # /subsystem:dll
- },
- },
- }],
- [ 'OS=="mac"', {
- 'defines': [
- 'uint=unsigned int', #Mac doesn't have uint either
- ],
- #MAC x64 users don't forget to comment out all line in
- #gyp\pylib\gyp\generator\make.py that contain append('-arch i386') (2 instances)
- 'libraries': [ #this is a hack to specify this linker option in make
- '-undefined dynamic_lookup',
- '-lexpat',
- ],
- }],
- [ 'OS=="linux"', {
- 'libraries': [
- '-lexpat',
- ],
- }]
- ],
- },
- ] # end targets
-}
-
diff --git a/tools/node-gyp b/tools/node-gyp
deleted file mode 100755
index 9a21eb4..0000000
--- a/tools/node-gyp
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-if [ -z "$NODE_ROOT" ]
-then
- echo "NODE_ROOT enviromnet variable is not set! It must point to the root of the node's git directory and contain folders src, deps/v8/include and deps/uv/include"
- echo "Check https://help.ubuntu.com/community/EnvironmentVariables on how to setup persistent environment variables"
- echo "Probably the easiest way is to add an 'export NODE_ROOT=$HOME/node' in your ~/.bashrc file"
- exit 1
-else
- Proper_Node_Dir=1
- [ -f "${NODE_ROOT}src/node.h" ] || { Proper_Node_Dir=0 && echo "ERROR: node.h was not in ${NODE_ROOT}src/node.h"; }
- [ -f "${NODE_ROOT}deps/v8/include/v8.h" ] || { Proper_Node_Dir=0 && echo "ERROR: v8.h was not in ${NODE_ROOT}deps/v8/include/v8.h"; }
- [ -f "${NODE_ROOT}deps/uv/include/uv.h" ] || { Proper_Node_Dir=0 && echo "ERROR: uv.h was not in ${NODE_ROOT}deps/uv/include/uv.h"; }
- if [ $Proper_Node_Dir -lt 1 ]
- then
- echo "The $NODE_ROOT doesn't seem to be correct"
- exit 1
- fi
-fi
-
-
-#Check if the user has specified an argument or use the default module.gyp
-module_filename=""
-if [ -z "$1" ]
-then
- [ -f "module.gyp" ] && module_filename="module.gyp" || echo "File module.gyp doesn't exist"
-else
- [ -f "$1" ] && module_filename="$1" || echo "File $1 doesn't exist"
-fi
-#if we haven't got a gyp file exit
-[ -z "$module_filename" ] && echo "Gyp file not found!" && exit 1
-echo "Generating project"
-${NODE_ROOT}tools/gyp/gyp -f make $module_filename --depth=. -DNODE_ROOT=$NODE_ROOT -Dexpat_root=""
-echo "Run make to compile the module"
diff --git a/tools/node-gyp.bat b/tools/node-gyp.bat
deleted file mode 100644
index 5bc09dd..0000000
--- a/tools/node-gyp.bat
+++ /dev/null
@@ -1,85 +0,0 @@
- at echo off
- at rem Check for nodejs build location variable
-if not defined NODE_ROOT goto nodebuild-not-found
-if not exist "%NODE_ROOT%\src\node.h" goto nodebuild-not-found
-if not exist "%NODE_ROOT%\deps\v8\include\v8.h" goto nodebuild-not-found
-if not exist "%NODE_ROOT%\deps\uv\include\uv.h" goto nodebuild-not-found
-if not exist "%NODE_ROOT%\tools\gyp\gyp" goto gyp-not-found
-
- at rem detect the location of the node.lib file
-set node_lib_folder=
-if exist "%NODE_ROOT%\Release\node.lib" set node_lib_folder=Release
-if not defined node_lib_folder if exist "%NODE_ROOT%\Debug\node.lib" set node_lib_folder=Debug
-if not defined node_lib_folder goto nodebuild-not-found
-
- at rem Check for expat location
-if not defined EXPAT_ROOT goto expat-not-found
-if not exist "%EXPAT_ROOT%\Source\lib\expat.h" goto expat-not-found
-echo NOTE: Make sure that "%EXPAT_ROOT%\BIN\" is in your path or that libexpat.dll otherwise you won't be able to load the module!
- at rem Check if user has specified the build command
-set requestedBuild= 0
- at rem Check if the first argument is make
-if "%1" == "make" set requestedBuild= 1
-if %requestedBuild% == 0 echo Run "node-gyp make" if you want to generate the project and build it at once.
- at rem Try to locate the gyp file
-set gypfile=
-if exist "module.gyp" set gypfile=module.gyp
-if not defined gypfile goto gyp-file-missing
- at rem Generate visual studio solution
-python %NODE_ROOT%\tools\gyp\gyp -f msvs -G msvs_version=2010 %gypfile% --depth=. -DNODE_ROOT=%NODE_ROOT% -Dnode_lib_folder=%node_lib_folder% -Dexpat_root=%EXPAT_ROOT%
-if errorlevel 1 goto exit-error
-if %requestedBuild% == 0 goto Finished
- at rem Build the solution
- at rem Check for visual studio tools if not already loaded
-if defined VCINSTALLDIR goto BuildSolution
- at rem Ensure that visual studio is available
-if not defined VS100COMNTOOLS goto msbuild-not-found
-if not exist "%VS100COMNTOOLS%..\..\vc\vcvarsall.bat" goto msbuild-not-found
-call "%VS100COMNTOOLS%..\..\vc\vcvarsall.bat"
- at rem Check that vs is properly loaded
-if not defined VCINSTALLDIR goto msbuild-not-found
-:BuildSolution
-call :BuildSolutionBasedOnGypFilename %gypfile%
-:Finished
-echo Finished
-goto exit
-:msbuild-not-found
-echo Visual studio tools were not found! Please check the VS100COMNTOOLS path variable
-goto exit
-:gyp-not-found
-echo GYP was not found. Please check that gyp is located in %NODE_ROOT%/tools/gyp/
-goto exit
-:nodebuild-not-found
-echo Node build path not found! Please check the NODE_ROOT environment variable exists and that it points to the root of the git repo where you have build node
-goto exit
-:gyp-file-missing
-echo Could not locate a gyp file. module.gyp file was not found.
-goto exit
-:msbuild-not-found
-echo Visual studio tools were not found! Please check the VS100COMNTOOLS path variable
-goto exit
-:solutions-file-not-found
-echo Generated solution file %generatedslnfile% was not found!
-goto exit
-:expat-not-found
-echo Expat root path not found! Please check the EXPAT_ROOT environment variable exists and that it points to the installation folder or expat
-goto exit
-:expat-not-in-path
-echo Expat library is not in your path environment variable. Even if it builds, the module will not load!
-goto exit
-:exit-error
-echo An error occured. Please check the above output
-:exit
- at rem clear local variables
-set node_lib_folder=
-set requestedBuild=
-set gypfile=
-goto :EOF
- at rem Internal procedures
-:BuildSolutionBasedOnGypFilename
-set generatedslnfile=%~n1.sln
-if not exist %generatedslnfile% goto solutions-file-not-found
- at rem call msbuild to build the sln file
-msbuild.exe %generatedslnfile%
-if errorlevel 1 goto exit-error
-goto :EOF
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-expat.git
More information about the Pkg-javascript-commits
mailing list