Skip to content

Commit

Permalink
Disable generation of Java uxact wrappers.
Browse files Browse the repository at this point in the history
  • Loading branch information
rescrv committed May 25, 2015
1 parent 8431b25 commit 014d408
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 628 deletions.
20 changes: 10 additions & 10 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,8 @@ EXTRA_DIST += bindings/java/org/hyperdex/client/LengthGreaterEqual.java
EXTRA_DIST += bindings/java/org/hyperdex/client/LengthLessEqual.java
EXTRA_DIST += bindings/java/org/hyperdex/client/LessEqual.java
EXTRA_DIST += bindings/java/org/hyperdex/client/LessThan.java
EXTRA_DIST += bindings/java/org/hyperdex/client/Microtransaction.java
EXTRA_DIST += bindings/java/org_hyperdex_client_Microtransaction.definitions.c
#EXTRA_DIST += bindings/java/org/hyperdex/client/Microtransaction.java
#EXTRA_DIST += bindings/java/org_hyperdex_client_Microtransaction.definitions.c
EXTRA_DIST += bindings/java/org/hyperdex/client/Operation.java
EXTRA_DIST += bindings/java/org/hyperdex/client/Predicate.java
EXTRA_DIST += bindings/java/org/hyperdex/client/Range.java
Expand All @@ -656,12 +656,12 @@ noinst_HEADERS += bindings/java/org_hyperdex_client_LengthGreaterEqual.h
noinst_HEADERS += bindings/java/org_hyperdex_client_LengthLessEqual.h
noinst_HEADERS += bindings/java/org_hyperdex_client_LessEqual.h
noinst_HEADERS += bindings/java/org_hyperdex_client_LessThan.h
noinst_HEADERS += bindings/java/org_hyperdex_client_Microtransaction.h
#noinst_HEADERS += bindings/java/org_hyperdex_client_Microtransaction.h
noinst_HEADERS += bindings/java/org_hyperdex_client_Range.h
noinst_HEADERS += bindings/java/org_hyperdex_client_Regex.h

libhyperdex_client_java_la_SOURCES =
libhyperdex_client_java_la_SOURCES += bindings/java/org_hyperdex_client_Microtransaction.c
#libhyperdex_client_java_la_SOURCES += bindings/java/org_hyperdex_client_Microtransaction.c
libhyperdex_client_java_la_SOURCES += bindings/java/org_hyperdex_client_Client.c
libhyperdex_client_java_la_CPPFLAGS = $(JNI_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
libhyperdex_client_java_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS) -Wmissing-prototypes
Expand Down Expand Up @@ -876,7 +876,7 @@ python_wrappers += test/sh/bindings.python.DataTypeString.sh
python_wrappers += test/sh/bindings.python.GroupAtomic.sh
python_wrappers += test/sh/bindings.python.HyperMongo.sh
python_wrappers += test/sh/bindings.python.LengthString.sh
python_wrappers += test/sh/bindings.python.Microtransactions.sh
#python_wrappers += test/sh/bindings.python.Microtransactions.sh
python_wrappers += test/sh/bindings.python.MultiAttribute.sh
python_wrappers += test/sh/bindings.python.RangeSearchInt.sh
python_wrappers += test/sh/bindings.python.RangeSearchString.sh
Expand Down Expand Up @@ -907,8 +907,8 @@ java_wrappers += test/sh/bindings.java.DataTypeSetInt.sh
java_wrappers += test/sh/bindings.java.DataTypeSetString.sh
java_wrappers += test/sh/bindings.java.DataTypeString.sh
java_wrappers += test/sh/bindings.java.LengthString.sh
java_wrappers += test/sh/bindings.java.Microtransactions.sh
java_wrappers += test/sh/bindings.java.MultitypeMicrotransactions.sh
#java_wrappers += test/sh/bindings.java.Microtransactions.sh
#java_wrappers += test/sh/bindings.java.MultitypeMicrotransactions.sh
java_wrappers += test/sh/bindings.java.MultiAttribute.sh
java_wrappers += test/sh/bindings.java.RangeSearchInt.sh
java_wrappers += test/sh/bindings.java.RangeSearchString.sh
Expand Down Expand Up @@ -1036,7 +1036,7 @@ EXTRA_DIST += test/python/DataTypeString.py
EXTRA_DIST += test/python/GroupAtomic.py
EXTRA_DIST += test/python/HyperMongo.py
EXTRA_DIST += test/python/LengthString.py
EXTRA_DIST += test/python/Microtransactions.py
#EXTRA_DIST += test/python/Microtransactions.py
EXTRA_DIST += test/python/MultiAttribute.py
EXTRA_DIST += test/python/RangeSearchInt.py
EXTRA_DIST += test/python/RangeSearchString.py
Expand Down Expand Up @@ -1065,8 +1065,8 @@ EXTRA_DIST += test/java/DataTypeSetInt.java
EXTRA_DIST += test/java/DataTypeSetString.java
EXTRA_DIST += test/java/DataTypeString.java
EXTRA_DIST += test/java/LengthString.java
EXTRA_DIST += test/java/Microtransactions.java
EXTRA_DIST += test/java/MultitypeMicrotransactions.java
#EXTRA_DIST += test/java/Microtransactions.java
#EXTRA_DIST += test/java/MultitypeMicrotransactions.java
EXTRA_DIST += test/java/MultiAttribute.java
EXTRA_DIST += test/java/RangeSearchInt.java
EXTRA_DIST += test/java/RangeSearchString.java
Expand Down
29 changes: 12 additions & 17 deletions bindings/java.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,18 +285,18 @@ def generate_client_java():
fout.write('\n'.join([generate_client_prototype(c) for c in bindings.Client if c.form is not bindings.MicrotransactionCall]))
fout.write('}\n')
fout.flush()
fout = open(os.path.join(BASE, 'bindings/java/org/hyperdex/client/Microtransaction.java'), 'w')
fout.write(bindings.copyright('*', '2015'))
fout.write(bindings.java.MICROTRANSACTION_HEAD)
fout.write('\n'.join([generate_microtransaction_prototype(c) for c in bindings.Client if c.form is bindings.MicrotransactionCall]))
fout.write('}\n')
fout.flush()
#fout = open(os.path.join(BASE, 'bindings/java/org/hyperdex/client/Microtransaction.java'), 'w')
#fout.write(bindings.copyright('*', '2015'))
#fout.write(bindings.java.MICROTRANSACTION_HEAD)
#fout.write('\n'.join([generate_microtransaction_prototype(c) for c in bindings.Client if c.form is bindings.MicrotransactionCall]))
#fout.write('}\n')
#fout.flush()
os.system('cd bindings/java && javac -cp . org/hyperdex/client/Client.java')
os.system('cd bindings/java && javah -cp . org.hyperdex.client.Client')
os.system('cd bindings/java && javah -cp . org.hyperdex.client.Client')
os.system('cd bindings/java && javah -cp . org.hyperdex.client.Client')
os.system('cd bindings/java && javac -cp . org/hyperdex/client/Microtransaction.java')
os.system('cd bindings/java && javah -cp . org.hyperdex.client.Microtransaction')
#os.system('cd bindings/java && javac -cp . org/hyperdex/client/Microtransaction.java')
#os.system('cd bindings/java && javah -cp . org.hyperdex.client.Microtransaction')
os.system('cd bindings/java && javah -cp . org.hyperdex.client.Deferred')
os.system('cd bindings/java && javah -cp . org.hyperdex.client.GreaterEqual')
os.system('cd bindings/java && javah -cp . org.hyperdex.client.GreaterThan')
Expand All @@ -314,10 +314,10 @@ def generate_client_java():
fout.write(bindings.java.DEFINITIONS_HEAD)
fout.write('\n'.join(generate_workers(bindings.Client)))
fout.write('\n'.join([generate_client_definition(c) for c in bindings.Client if c.form is not bindings.MicrotransactionCall]))
fout = open(os.path.join(BASE, 'bindings/java/org_hyperdex_client_Microtransaction.definitions.c'), 'w')
fout.write(bindings.copyright('*', '2015'))
fout.write(bindings.java.DEFINITIONS_HEAD)
fout.write('\n'.join([generate_microtransaction_definition(c) for c in bindings.Client if c.form is bindings.MicrotransactionCall]))
#fout = open(os.path.join(BASE, 'bindings/java/org_hyperdex_client_Microtransaction.definitions.c'), 'w')
#fout.write(bindings.copyright('*', '2015'))
#fout.write(bindings.java.DEFINITIONS_HEAD)
#fout.write('\n'.join([generate_microtransaction_definition(c) for c in bindings.Client if c.form is bindings.MicrotransactionCall]))

def generate_client_doc():
fout = open(os.path.join(BASE, 'doc/java/client/ops.tex'), 'w')
Expand Down Expand Up @@ -427,11 +427,6 @@ def generate_client_doc():
}
}
public Microtransaction initMicrotransaction(String space)
{
return new Microtransaction(this, space);
}
public synchronized void destroy()
{
if (ptr != 0)
Expand Down
5 changes: 0 additions & 5 deletions bindings/java/org/hyperdex/client/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ protected void finalize() throws Throwable
}
}

public Microtransaction initMicrotransaction(String space)
{
return new Microtransaction(this, space);
}

public synchronized void destroy()
{
if (ptr != 0)
Expand Down
107 changes: 0 additions & 107 deletions bindings/java/org/hyperdex/client/Microtransaction.java

This file was deleted.

Loading

0 comments on commit 014d408

Please sign in to comment.