rtyler/avatar-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use absolute path for the source files.

Browse Source 
Reviewed-by: asquare
This commit is contained in:
Kinsley Wong 2013-11-22 15:46:17 -08:00
parent 91c54e164d
commit 44a56c93e6
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
avatar-js.gyp
View File

@ -3,7 +3,8 @@
'config.gypi',
},
'variables': {
'AVATAR-JS_PATH%': 'out/<(target)/lib.target',
'AVATAR_JS_HOME%': '<(AVATAR_JS_HOME%)',
'SRC%': '<(AVATAR_JS_HOME%)/out/<(target)/obj.target/avatar-js',
},
'target_defaults': {
'default_configuration': '<(target)',
@ -14,6 +15,9 @@
'conditions': [
['OS == "win"', {
'msvs_settings': {
'VCCLCompilerTool': {
'ObjectFile': 'out\<(target)\obj.target\\avatar-js\\',
},
'VCLinkerTool': {
'GenerateDebugInformation': 'true',
},
@ -77,9 +81,9 @@
}]
],
'sources': [
'<(AVATAR-JS_PATH)/../obj.target/avatar-js/os.cpp',
'<(AVATAR-JS_PATH)/../obj.target/avatar-js/process.cpp',
'<(AVATAR-JS_PATH)/../obj.target/avatar-js/throw.cpp',
'<(SRC)/os.cpp',
'<(SRC)/process.cpp',
'<(SRC)/throw.cpp',
],
'libraries': [
],
@ -97,9 +101,9 @@
}]
],
'sources': [
'<(AVATAR-JS_PATH)/../obj.target/avatar-js/os.cpp',
'<(AVATAR-JS_PATH)/../obj.target/avatar-js/process.cpp',
'<(AVATAR-JS_PATH)/../obj.target/avatar-js/throw.cpp',
'<(SRC)/os.cpp',
'<(SRC)/process.cpp',
'<(SRC)/throw.cpp',
],
'defines': [
'_UNICODE',

14
common.xml
View File

@ -90,6 +90,9 @@
<echo file="${gypi}" append="true">{ 'variables': { ${line.separator}</echo>
<echo file="${gypi}" append="true"> 'JAVA_HOME%': '${jdk.home}', ${line.separator}</echo>
<echo file="${gypi}" append="true"> 'SOURCE_HOME%': '${source.home}', ${line.separator}</echo>
<echo file="${gypi}" append="true"> 'LIBUV_JAVA_HOME%': '${libuv.home}', ${line.separator}</echo>
<echo file="${gypi}" append="true"> 'HTTP_PARSER_JAVA_HOME%': '${http-parser.home}', ${line.separator}</echo>
<echo file="${gypi}" append="true"> 'AVATAR_JS_HOME%': '${avatar-js.home}', ${line.separator}</echo>
<echo file="${gypi}" append="true"> },${line.separator}</echo>
<echo file="${gypi}" append="true"> 'target_defaults': {'default_configuration': '${build.type}'}${line.separator}</echo>
<echo file="${gypi}" append="true">}${line.separator}</echo>
@ -139,7 +142,9 @@
</target>
<target name="make-linux" if="isLinux" unless="product.lib.uptodate">
<exec executable="make" failonerror="true"/>
<exec executable="make" failonerror="true">
<arg value="builddir_name=out"/>
</exec>
</target>
<target name="make-macos" if="isMacOSX" unless="product.lib.uptodate">
@ -149,6 +154,7 @@
<target name="make-windows" if="isWindows" unless="product.lib.uptodate">
<exec executable="msbuild" failonerror="true">
<arg value="${product.name}.sln"/>
<arg value="/p:outdir=out/${build.type}/"/>
<arg value="/p:Platform=x64"/>
<arg value="/p:Configuration=${build.type}"/>
</exec>
@ -156,6 +162,9 @@
<target name="shlib-linux" depends="init" if="isLinux">
<fileset dir="${basedir}/out/${source.home}" id="libuv" includes="**/*.o" excludes="**/test/*" erroronmissingdir="false"/>
<pathconvert property="libuv.objs" refid="libuv" pathsep=" " />
<fileset dir="${libuv.home}/out/${build.type}" id="libuv-java" includes="**/*.o" excludes="**/test/*" erroronmissingdir="false"/>
<pathconvert property="libuv-java.objs" refid="libuv-java" pathsep=" "/>
@ -169,6 +178,7 @@
<arg value="-shared"/>
<arg value="-o"/>
<arg value="libavatar-js.so"/>
<arg line="${libuv.objs}"/>
<arg line="${libuv-java.objs}"/>
<arg line="${http-parser-java.objs}"/>
<arg line="${avatar-js.objs}"/>
@ -211,7 +221,7 @@
<fileset dir="${source.home}/deps/uv/${build.type}" id="libuv" includes="**/*.obj" excludes="**/test/*" erroronmissingdir="false"/>
<pathconvert property="libuv.objs" refid="libuv" pathsep=" " />
<fileset dir="${libuv.home}/${build.type}" id="libuv-java" includes="**/*.obj" erroronmissingdir="false"/>
<fileset dir="${libuv.home}/out/${build.type}" id="libuv-java" includes="**/*.obj" erroronmissingdir="false"/>
<pathconvert property="libuv-java.objs" refid="libuv-java" pathsep=" " />
<fileset dir="${http-parser.home}/${build.type}" id="http-parser-java" includes="**/*.obj" erroronmissingdir="false"/>