AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's just install rather than build and install here as well.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@337 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Michael Bayne
2007-11-10 19:43:07 +00:00
parent fd64f4d460
commit 93e28d42a6
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+3 -4
View File
@@ -80,7 +80,7 @@
</target> </target>
<!-- build the native libraries --> <!-- build the native libraries -->
<target name="ncompile" depends="prepare"> <target name="ninstall" depends="prepare">
<echo level="info" message="Doing native compilation on ${os.name}..."/> <echo level="info" message="Doing native compilation on ${os.name}..."/>
<exec os="Linux" dir="src/java/com/threerings/util/keybd/Linux" <exec os="Linux" dir="src/java/com/threerings/util/keybd/Linux"
executable="make"><arg line="install"/></exec> executable="make"><arg line="install"/></exec>
@@ -122,11 +122,10 @@
</target> </target>
<!-- a target for rebuilding everything --> <!-- a target for rebuilding everything -->
<target name="all" <target name="all" depends="clean,prepare,compile,ninstall,javadoc,tests,dist"/>
depends="clean,prepare,compile,ncompile,javadoc,tests,dist"/>
<!-- builds our distribution files (war and jar) --> <!-- builds our distribution files (war and jar) -->
<target name="dist" depends="prepare,compile,ncompile,tests"> <target name="dist" depends="prepare,compile,ninstall,tests">
<!-- build our various jar files --> <!-- build our various jar files -->
<jar destfile="${deploy.dir}/${app.name}-rsrc.jar"> <jar destfile="${deploy.dir}/${app.name}-rsrc.jar">
<fileset dir="${classes.dir}" includes="com/threerings/resource/**"/> <fileset dir="${classes.dir}" includes="com/threerings/resource/**"/>
src/java/com/threerings/util/unsafe/FreeBSD/Makefile
+1 -1
View File
@@ -29,7 +29,7 @@ TARGET=libunsafe.so
all: ${TARGET} all: ${TARGET}
install: ${TARGET} install:
@${MKDIR} -p ${INSTALL_PATH} @${MKDIR} -p ${INSTALL_PATH}
cp ${TARGET} ${INSTALL_PATH} cp ${TARGET} ${INSTALL_PATH}
src/java/com/threerings/util/unsafe/Linux/Makefile
+1 -1
View File
@@ -28,7 +28,7 @@ TARGET=libunsafe.so
all: ${TARGET} all: ${TARGET}
install: ${TARGET} install:
@${MKDIR} -p ${INSTALL_PATH} @${MKDIR} -p ${INSTALL_PATH}
cp ${TARGET} ${INSTALL_PATH} cp ${TARGET} ${INSTALL_PATH}
src/java/com/threerings/util/unsafe/Mac OS X/Makefile
+1 -1
View File
@@ -29,7 +29,7 @@ TARGET=libunsafe.jnilib
all: ${TARGET} all: ${TARGET}
install: ${TARGET} install:
@${MKDIR} -p ${INSTALL_PATH} @${MKDIR} -p ${INSTALL_PATH}
cp ${TARGET} ${INSTALL_PATH} cp ${TARGET} ${INSTALL_PATH}