ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added build.xml for zwave plugin

Browse source
This commit is contained in:
Ziver Koc 2017-05-24 16:05:49 +02:00
parent c897c5ba60
commit efdbc56859
4 changed files with 96 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Hal.iml
View file

@ -8,6 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/resource" type="java-resource" relativeOutputPath="resource" /> <sourceFolder url="file://$MODULE_DIR$/resource" type="java-resource" relativeOutputPath="resource" />
<sourceFolder url="file://$MODULE_DIR$/plugins/zwave/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/plugins/zwave/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/plugins/zwave/build" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />

61
build.xml
View file

@ -4,33 +4,36 @@
<!-- ________________________ PROPERTIES AND SETTINGS ________________________ --> <!-- ________________________ PROPERTIES AND SETTINGS ________________________ -->
<!--common properties--> <!--common properties-->
<property name="gitRoot" value="." /> <property name="root" value="." />
<property name="srcDir" value="${gitRoot}/src" /> <property name="srcDir" value="${root}/src" />
<property name="testDir" value="${gitRoot}/test" /> <property name="testDir" value="${root}/test" />
<property name="libDir" value="${gitRoot}/lib" /> <property name="libDir" value="${root}/lib" />
<property name="outputRoot" value="${gitRoot}/build" />
<property name="buildDir" value="${outputRoot}/production" /> <property name="buildRoot" value="${root}/build" />
<property name="buildTestDir" value="${outputRoot}/test" /> <property name="compileDir" value="${buildRoot}/production" />
<property name="releaseDir" value="${outputRoot}/release" /> <property name="compileTestDir" value="${buildRoot}/test" />
<property name="reportsDir" value="${outputRoot}/reports" /> <property name="releaseDir" value="${buildRoot}/release" />
<property name="reportsDir" value="${buildRoot}/reports" />
<property name="releaseJar" value="hal.jar" />
<!-- ________________________ CLASSPATH ________________________ -->
<!--define standard arguments for javac--> <!--define standard arguments for javac-->
<presetdef name="javac"> <presetdef name="javac">
<javac includeantruntime="false" /> <javac includeantruntime="false" />
</presetdef> </presetdef>
<!-- ________________________ CLASSPATHS ________________________ -->
<!--classpath included when building--> <!--classpath included when building-->
<path id="classpath.build"> <path id="classpath.build">
<fileset dir="${libDir}"> <fileset dir="${libDir}">
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
<pathelement location="${buildDir}" /> <pathelement location="${compileDir}" />
</path> </path>
<path id="classpath.test"> <path id="classpath.test">
<pathelement location="${buildTestDir}" /> <pathelement location="${compileTestDir}" />
<!--include libraries used for building--> <!--include libraries used for building-->
<path refid="classpath.build"/> <path refid="classpath.build"/>
</path> </path>
@ -40,7 +43,7 @@
<target name="run" depends="package"> <target name="run" depends="package">
<java fork="true" failonerror="true" classname="se.hal.HalServer"> <java fork="true" failonerror="true" classname="se.hal.HalServer">
<classpath> <classpath>
<pathelement path="${releaseDir}/hal.jar"/> <pathelement path="${releaseDir}/${releaseJar}"/>
<pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?-->
</classpath> </classpath>
</java> </java>
@ -50,7 +53,7 @@
<java fork="true" failonerror="true" classname="se.hal.HalServer"> <java fork="true" failonerror="true" classname="se.hal.HalServer">
<jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" /> <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" />
<classpath> <classpath>
<pathelement path="${releaseDir}/hal.jar"/> <pathelement path="${releaseDir}/${releaseJar}"/>
<pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?--> <pathelement path="${libDir}/*"/> <!--wildcard may not be platform independent, ok?-->
</classpath> </classpath>
</java> </java>
@ -64,7 +67,7 @@
<formatter type="xml" /> <!-- to file --> <formatter type="xml" /> <!-- to file -->
<batchtest todir="${reportsDir}" skipNonTests="true"> <batchtest todir="${reportsDir}" skipNonTests="true">
<fileset dir="${buildTestDir}" includes="**/*Test*.class" /> <fileset dir="${compileTestDir}" includes="**/*Test*.class" />
</batchtest> </batchtest>
</junit> </junit>
</target> </target>
@ -74,37 +77,37 @@
<!--clean all build paths--> <!--clean all build paths-->
<target name="clean"> <target name="clean">
<delete includeemptydirs="true" failonerror="false"> <delete includeemptydirs="true" failonerror="false">
<fileset dir="${outputRoot}" includes="**/*"/> <fileset dir="${buildRoot}" includes="**/*"/>
</delete> </delete>
</target> </target>
<!--build product code--> <!--build product code-->
<target name="build" depends="build-dependencies"> <target name="build" depends="build-dependencies">
<mkdir dir="${buildDir}" /> <mkdir dir="${compileDir}" />
<javac srcdir="${srcDir}" destdir="${buildDir}" debug="yes" debugLevel="lines,vars,source" fork="yes"> <javac srcdir="${srcDir}" destdir="${compileDir}" debug="yes" debugLevel="lines,vars,source" fork="yes">
<classpath refid="classpath.build" /> <classpath refid="classpath.build" />
<include name="**/*.java" /> <include name="**/*.java" />
<exclude name="se/hal/tts/GoogleTTSClient.java" /> <exclude name="se/hal/tts/GoogleTTSClient.java" />
</javac> </javac>
<copy todir="${buildDir}"> <copy todir="${compileDir}">
<fileset dir="${srcDir}" <fileset dir="${srcDir}"
excludes="**/*.java" /> excludes="**/*.java" />
</copy> </copy>
</target> </target>
<target name="build-dependencies"> <target name="build-dependencies">
<mkdir dir="${buildDir}" /> <mkdir dir="${compileDir}" />
<get src="http://ci.koc.se/jenkins/job/Zutil/147/artifact/build/release/Zutil.jar" <get src="http://ci.koc.se/jenkins/job/Zutil/147/artifact/build/release/Zutil.jar"
dest="${libDir}" verbose="true" usetimestamp="true"/> dest="${libDir}" verbose="true" usetimestamp="true"/>
</target> </target>
<target name="build-test" depends="build"> <target name="build-test" depends="build">
<mkdir dir="${buildTestDir}" /> <mkdir dir="${compileTestDir}" />
<javac srcdir="${testDir}" destdir="${buildTestDir}" debug="yes" debugLevel="lines,vars,source" fork="yes"> <javac srcdir="${testDir}" destdir="${compileTestDir}" debug="yes" debugLevel="lines,vars,source" fork="yes">
<classpath refid="classpath.test" /> <classpath refid="classpath.test" />
<include name="**/*.java" /> <include name="**/*.java" />
</javac> </javac>
<copy todir="${buildTestDir}"> <copy todir="${compileTestDir}">
<fileset dir="${testDir}" <fileset dir="${testDir}"
excludes="**/*.java" /> excludes="**/*.java" />
</copy> </copy>
@ -112,10 +115,10 @@
<target name="package" depends="build"> <target name="package" depends="build">
<copy todir="${releaseDir}" > <copy todir="${releaseDir}" >
<fileset file="${gitRoot}/hal.conf.example" /> <fileset file="${root}/hal.conf.example" />
<fileset file="${gitRoot}/hal-default.db" /> <fileset file="${root}/hal-default.db" />
<fileset file="${gitRoot}/logging.properties" /> <fileset file="${root}/logging.properties" />
<fileset file="${gitRoot}/run.sh" /> <fileset file="${root}/run.sh" />
</copy> </copy>
<copy todir="${releaseDir}/lib"> <copy todir="${releaseDir}/lib">
<fileset dir="${libDir}" excludes="junit-*.jar,hamcrest-*.jar" /> <fileset dir="${libDir}" excludes="junit-*.jar,hamcrest-*.jar" />
@ -123,7 +126,7 @@
<copy todir="${releaseDir}/resource/web"> <copy todir="${releaseDir}/resource/web">
<fileset dir="resource/web" /> <fileset dir="resource/web" />
</copy> </copy>
<jar destfile="${releaseDir}/hal.jar" basedir="${buildDir}" /> <jar destfile="${releaseDir}/${releaseJar}" basedir="${compileDir}" />
</target> </target>

63
plugins/zwave/build.xml Executable file
View file

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="ZWave Plugin" >
<!-- ________________________ PROPERTIES AND SETTINGS ________________________ -->
<!--common properties-->
<property name="root" value="." />
<property name="srcDir" value="${root}/src" />
<property name="libDir" value="${root}/lib" />
<property name="buildRoot" value="${root}/build" />
<property name="compileDir" value="${buildRoot}/production" />
<property name="releaseDir" value="${buildRoot}/release" />
<property name="releaseJar" value="zwave.jar" />
<!-- ________________________ CLASSPATH ________________________ -->
<!--define standard arguments for javac-->
<presetdef name="javac">
<javac includeantruntime="false" />
</presetdef>
<!--classpath included when building-->
<path id="classpath.build">
<fileset dir="${libDir}">
<include name="**/*.jar"/>
</fileset>
<pathelement location="${compileDir}" />
<!-- Hal core -->
<pathelement location="../../build/production" />
<fileset dir="../../lib">
<include name="**/*.jar"/>
</fileset>
</path>
<!-- ________________________ BUILD TARGETS ________________________ -->
<!--clean all build paths-->
<target name="clean">
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${buildRoot}" includes="**/*"/>
</delete>
</target>
<!--build product code-->
<target name="build">
<mkdir dir="${compileDir}" />
<javac srcdir="${srcDir}" destdir="${compileDir}" debug="yes" debugLevel="lines,vars,source" fork="yes">
<classpath refid="classpath.build" />
<include name="**/*.java" />
</javac>
<copy todir="${compileDir}">
<fileset dir="${srcDir}"
excludes="**/*.java" />
</copy>
</target>
<target name="package" depends="build">
<jar destfile="${releaseDir}/${releaseJar}" basedir="${compileDir}" />
</target>
</project>

3
plugins/zwave/src/io/netty/channel/jsc/JSCChannelConfig.java
View file

@ -222,9 +222,6 @@ public interface JSCChannelConfig extends ChannelConfig {
@Override @Override
JSCChannelConfig setAutoRead(boolean autoRead); JSCChannelConfig setAutoRead(boolean autoRead);
@Override
JSCChannelConfig setAutoClose(boolean autoClose);
@Override @Override
JSCChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark); JSCChannelConfig setWriteBufferHighWaterMark(int writeBufferHighWaterMark);