Commit 32e47b82 authored by Sven Gestegård Robertz's avatar Sven Gestegård Robertz
Browse files

Merge branch 'typedefs' of gitlab.control.lth.se:anders_blomdell/labcomm into typedefs

parents 019e5a77 bb99f89d
.PHONY: all
all: all:
cd c ; make cd c ; make
cd csharp ; make cd csharp ; make
cd java ; make cd java ; make
.PHONY: test
test: test:
$(MAKE) -C c test $(MAKE) -C c test
.PHONY: clean
clean: clean:
cd c ; make clean $(MAKE) -C c clean
cd csharp ; make clean $(MAKE) -C csharp clean
cd java ; make clean $(MAKE) -C java clean
$(MAKE) -C python clean $(MAKE) -C python clean
.PHONY: distclean
distclean: distclean:
cd c ; make distclean $(MAKE) -C c distclean
cd csharp ; make clean $(MAKE) -C csharp distclean
cd java ; make clean $(MAKE) -C java distclean
$(MAKE) -C python clean $(MAKE) -C python distclean
...@@ -84,23 +84,14 @@ ...@@ -84,23 +84,14 @@
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_NONE,type,nr,0) LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_NONE,type,nr,0)
#define LABCOMM_IOR(type,nr,size) \ #define LABCOMM_IOR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
/* FIXME: add flag to differentiate between size and nargs */
#define LABCOMM_IORN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOW(type,nr,size) \ #define LABCOMM_IOW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOWN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOS(type,nr) \ #define LABCOMM_IOS(type,nr) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,0) LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,0)
#define LABCOMM_IOSR(type,nr,size) \ #define LABCOMM_IOSR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
#define LABCOMM_IOSRN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOSW(type,nr,size) \ #define LABCOMM_IOSW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOSWN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN \ #define LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN \
LABCOMM_IOR(0,1,int) LABCOMM_IOR(0,1,int)
......
...@@ -84,23 +84,14 @@ ...@@ -84,23 +84,14 @@
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_NONE,type,nr,0) LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_NONE,type,nr,0)
#define LABCOMM_IOR(type,nr,size) \ #define LABCOMM_IOR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
/* FIXME: add flag to differentiate between size and nargs */
#define LABCOMM_IORN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOW(type,nr,size) \ #define LABCOMM_IOW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOWN(type,nr,nargs) \ #define LABCOMM_IOS(type,nr) \
LABCOMM_IOC(LABCOMM_IOC_NOSIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOS(type,nr) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,0) LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,0)
#define LABCOMM_IOSR(type,nr,size) \ #define LABCOMM_IOSR(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,sizeof(size))
#define LABCOMM_IOSRN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_READ,type,nr,nargs)
#define LABCOMM_IOSW(type,nr,size) \ #define LABCOMM_IOSW(type,nr,size) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size)) LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,sizeof(size))
#define LABCOMM_IOSWN(type,nr,nargs) \
LABCOMM_IOC(LABCOMM_IOC_USESIG,LABCOMM_IOC_WRITE,type,nr,nargs)
#define LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN \ #define LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN \
LABCOMM_IOR(0,1,int) LABCOMM_IOR(0,1,int)
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<AssemblyName>LabComm</AssemblyName>
<ProjectGuid>{755CD5A6-C48E-4D35-B0BE-8EC0FDE1A2A1}</ProjectGuid>
<!-- Properties which affect the build process -->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="se\lth\control\labcomm\LabCommDispatcher.cs" />
<Compile Include="se\lth\control\labcomm\LabCommDecoderRegistry.cs" />
<Compile Include="se\lth\control\labcomm\LabComm.cs" />
<Compile Include="se\lth\control\labcomm\LabCommSample.cs" />
<Compile Include="se\lth\control\labcomm\LabCommHandler.cs" />
<Compile Include="se\lth\control\labcomm\LabCommEncoderRegistry.cs" />
<Compile Include="se\lth\control\labcomm\LabCommDecoder.cs" />
<Compile Include="se\lth\control\labcomm\LabCommType.cs" />
<Compile Include="se\lth\control\labcomm\LabCommEncoderChannel.cs" />
<Compile Include="se\lth\control\labcomm\LabCommEncoder.cs" />
<Compile Include="se\lth\control\labcomm\LabCommDecoderChannel.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
...@@ -16,4 +16,6 @@ labcomm.dll: $(MODULES:%=se/lth/control/labcomm/%.cs) Makefile ...@@ -16,4 +16,6 @@ labcomm.dll: $(MODULES:%=se/lth/control/labcomm/%.cs) Makefile
mcs -out:$@ -target:library $(filter %.cs, $^) mcs -out:$@ -target:library $(filter %.cs, $^)
clean: clean:
distclean:
rm -f labcomm.dll rm -f labcomm.dll
...@@ -20,31 +20,38 @@ MODULES=Constant \ ...@@ -20,31 +20,38 @@ MODULES=Constant \
all: labcomm.jar labcomm2014.jar labcomm2006.jar all: labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar: gen/JAVAC labcomm.jar: gen/JAVAC osgi-manifest-all.txt
echo $@ echo $@
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class cd gen ; jar cfm ../$@ ../osgi-manifest-all.txt \
se/lth/control/labcomm/*.class \
se/lth/control/labcomm2006/*.class
labcomm2014.jar: gen/JAVAC labcomm2014.jar: gen/JAVAC osgi-manifest-2014.txt
echo $@ echo $@
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class cd gen ; jar cfm ../$@ ../osgi-manifest-2014.txt \
se/lth/control/labcomm/*.class
labcomm2006.jar: gen/JAVAC labcomm2006.jar: gen/JAVAC osgi-manifest-2006.txt
echo $@ echo $@
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class cd gen ; jar cfm ../$@ ../osgi-manifest-2006.txt \
se/lth/control/labcomm2006/*.class
gen: gen:
mkdir gen mkdir gen
gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control/labcomm2006/%.java) Makefile | gen gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) \
javac -cp ../../compiler/labcomm_compiler.jar -d gen $(filter %.java, $^) $(MODULES:%=se/lth/control/labcomm2006/%.java) \
Makefile | gen
javac -cp ../../compiler/labcomm_compiler.jar -d gen \
$(filter %.java, $^)
touch $@ touch $@
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen rm -rf gen
.PHONY: distclean .PHONY: distclean
distclean:
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar
distclean: clean
Bundle-Description: Provides Labcomm to bundles Bundle-Description: Provides Labcomm to bundles
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm Bundle-SymbolicName: se.lth.control.labcomm2006
Bundle-Vendor: LTH Bundle-Vendor: LTH
Bundle-Version: 1.0.0 Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm;version="1.0.0",se.lth.control.la Export-Package: se.lth.control.labcomm2006;version="1.0.0"
bcomm2006;version="1.0.0"
Bundle-Description: Provides Labcomm 2014 to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm2014
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm;version="1.0.0"
Bundle-Description: Provides Labcomm 2006/2014 to bundles
Bundle-ManifestVersion: 2
Bundle-Name: Labcomm OSGi
Bundle-SymbolicName: se.lth.control.labcomm-all
Bundle-Vendor: LTH
Bundle-Version: 1.0.0
Export-Package: se.lth.control.labcomm2006;version="1.0.0",
se.lth.control.labcomm;version="1.0.0"
.PHONY: clean
clean: clean:
find . -name '*.pyc' -exec rm {} \; find . -name '*.pyc' -exec rm {} \;
distclean: .PHONY: distclean
find . -name '*.pyc' -exec rm {} \; distclean: clean
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment