diff options
author | Wayne Meissner <wmeissner@gmail.com> | 2009-12-12 09:15:28 +1000 |
---|---|---|
committer | Wayne Meissner <wmeissner@gmail.com> | 2009-12-12 09:15:28 +1000 |
commit | 552ab39936d73b00b9ba505aff0a5db4f0300b2d (patch) | |
tree | 33dc611d7b3fe2e4583c12487c612a3ff7a9f487 | |
parent | 454220efb82988b01c4c2738e8fb2f53e303dbf3 (diff) | |
download | ffi-552ab39936d73b00b9ba505aff0a5db4f0300b2d.tar.gz |
Sync netbeans metadata
-rw-r--r-- | nbproject/Makefile-impl.mk | 4 | ||||
-rw-r--r-- | nbproject/Makefile-variables.mk | 16 | ||||
-rw-r--r-- | nbproject/Makefile-x86_64-Linux.mk (renamed from nbproject/Makefile-Default.mk) | 14 | ||||
-rw-r--r-- | nbproject/Package-x86_64-Linux.bash (renamed from nbproject/Package-Default.bash) | 4 | ||||
-rw-r--r-- | nbproject/configurations.xml | 14 |
5 files changed, 27 insertions, 25 deletions
diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk index 28d5d75..d6a7947 100644 --- a/nbproject/Makefile-impl.mk +++ b/nbproject/Makefile-impl.mk @@ -27,11 +27,11 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} PROJECTNAME=ruby-ffi.git # Active Configuration -DEFAULTCONF=Default +DEFAULTCONF=x86_64-Linux CONF=${DEFAULTCONF} # All Configurations -ALLCONFS=Default +ALLCONFS=x86_64-Linux # build diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk index 294a88e..9ee818c 100644 --- a/nbproject/Makefile-variables.mk +++ b/nbproject/Makefile-variables.mk @@ -6,11 +6,11 @@ CND_BASEDIR=`pwd` CND_BUILDDIR=build CND_DISTDIR=dist -# Default configuration -CND_PLATFORM_Default=GNU-Solaris-x86 -CND_ARTIFACT_DIR_Default= -CND_ARTIFACT_NAME_Default= -CND_ARTIFACT_PATH_Default= -CND_PACKAGE_DIR_Default=dist/Default/GNU-Solaris-x86/package -CND_PACKAGE_NAME_Default=ruby-ffi.git.tar -CND_PACKAGE_PATH_Default=dist/Default/GNU-Solaris-x86/package/ruby-ffi.git.tar +# x86_64-Linux configuration +CND_PLATFORM_x86_64-Linux=GNU-Linux-x86 +CND_ARTIFACT_DIR_x86_64-Linux= +CND_ARTIFACT_NAME_x86_64-Linux= +CND_ARTIFACT_PATH_x86_64-Linux= +CND_PACKAGE_DIR_x86_64-Linux=dist/x86_64-Linux/GNU-Linux-x86/package +CND_PACKAGE_NAME_x86_64-Linux=ruby-ffi.git.tar +CND_PACKAGE_PATH_x86_64-Linux=dist/x86_64-Linux/GNU-Linux-x86/package/ruby-ffi.git.tar diff --git a/nbproject/Makefile-Default.mk b/nbproject/Makefile-x86_64-Linux.mk index b99fc03..b9a4959 100644 --- a/nbproject/Makefile-Default.mk +++ b/nbproject/Makefile-x86_64-Linux.mk @@ -15,12 +15,12 @@ RANLIB=ranlib CC=gcc CCC=g++ CXX=g++ -FC=g77 -AS=gas +FC= +AS=as # Macros -CND_PLATFORM=GNU-Solaris-x86 -CND_CONF=Default +CND_PLATFORM=GNU-Linux-x86 +CND_CONF=x86_64-Linux CND_DISTDIR=dist # Include project Makefile @@ -50,14 +50,14 @@ LDLIBSOPTIONS= # Build Targets .build-conf: ${BUILD_SUBPROJECTS} - cd . && rake compile + cd . && ${MAKE} # Subprojects .build-subprojects: # Clean Targets -.clean-conf: - cd . && rake clean +.clean-conf: ${CLEAN_SUBPROJECTS} + cd . && ${MAKE} clean # Subprojects .clean-subprojects: diff --git a/nbproject/Package-Default.bash b/nbproject/Package-x86_64-Linux.bash index f936652..6c40a8d 100644 --- a/nbproject/Package-Default.bash +++ b/nbproject/Package-x86_64-Linux.bash @@ -6,8 +6,8 @@ # Macros TOP=`pwd` -CND_PLATFORM=GNU-Solaris-x86 -CND_CONF=Default +CND_PLATFORM=GNU-Linux-x86 +CND_CONF=x86_64-Linux CND_DISTDIR=dist TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging TMPDIRNAME=tmp-packaging diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 6e5da59..2781845 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -95,27 +95,29 @@ projectFiles="false"> <itemPath>Makefile</itemPath> <itemPath>Rakefile</itemPath> + <itemPath>ext/ffi_c/extconf.rb</itemPath> <itemPath>ruby-ffi-Makefile.mk</itemPath> </logicalFolder> </logicalFolder> <projectmakefile>ruby-ffi-Makefile.mk</projectmakefile> <confs> - <conf name="Default" type="0"> + <conf name="x86_64-Linux" type="0"> <toolsSet> <developmentServer>localhost</developmentServer> <compilerSet>GNU|GNU</compilerSet> - <platform>1</platform> + <platform>2</platform> </toolsSet> <makefileType> <makeTool> <buildCommandWorkingDir>.</buildCommandWorkingDir> - <buildCommand>rake compile</buildCommand> - <cleanCommand>rake clean</cleanCommand> + <buildCommand>${MAKE}</buildCommand> + <cleanCommand>${MAKE} clean</cleanCommand> <executablePath></executablePath> <cTool> <incDir> - <pElem>/usr/local/ruby-1.8.6-p369/lib/ruby/1.8/i386-solaris2.11</pElem> - <pElem>/usr/lib/libffi-3.0.5/include</pElem> + <pElem>/usr/local/ruby-trunk/include/ruby-1.9.1/ruby</pElem> + <pElem>/usr/local/ruby-trunk/include/ruby-1.9.1</pElem> + <pElem>/usr/include/x86_64-linux-gnu</pElem> </incDir> </cTool> </makeTool> |