Merge branch 'master' of github.com:mbien/gluegen

1 files changed, 21 insertions, 3 deletions

diff --git a/make/build.xml b/make/build.xml
index 3284d19..3301125 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -425,27 +425,45 @@
     -->
   <target name="pre-build">
 
+    <!-- Int*Maps -->
     <antcall target="create-map" inheritrefs="true">
+        <param name="map.src" value="IntIntHashMap"/>
         <param name="map.name" value="IntObjectHashMap"/>
         <param name="map.value" value="Object"/>
         <param name="map.null" value="null"/>
     </antcall>
 
     <antcall target="create-map" inheritrefs="true">
+        <param name="map.src" value="IntIntHashMap"/>
         <param name="map.name" value="IntLongHashMap"/>
         <param name="map.value" value="long"/>
         <param name="map.null" value="0"/>
     </antcall>
 
+    <!-- Long*Maps -->
+    <antcall target="create-map" inheritrefs="true">
+        <param name="map.src" value="LongIntHashMap"/>
+        <param name="map.name" value="LongObjectHashMap"/>
+        <param name="map.value" value="Object"/>
+        <param name="map.null" value="null"/>
+    </antcall>
+
+    <antcall target="create-map" inheritrefs="true">
+        <param name="map.src" value="LongIntHashMap"/>
+        <param name="map.name" value="LongLongHashMap"/>
+        <param name="map.value" value="long"/>
+        <param name="map.null" value="0"/>
+    </antcall>
+
   </target>
 
   <target name="create-map">
     <!-- substitutes certain token in IntIntHashmap to create new primitive HasmMap-->
-    <copy file="${src.java}/com/jogamp/common/util/IntIntHashMap.java"
+    <copy file="${src.java}/com/jogamp/common/util/${map.src}.java"
         tofile="${src.generated.java}/com/jogamp/common/util/${map.name}.java" overwrite="true">
         <filterchain>
-            <replaceregex pattern="IntIntHashMap" replace="${map.name}"/>
-            <replaceregex pattern="@see ${map.name}" replace="@see IntIntHashMap"/>
+            <replaceregex pattern="${map.src}" replace="${map.name}"/>
+            <replaceregex pattern="@see ${map.name}" replace="@see ${map.src}"/>
             <replaceregex pattern="/\*value\*/int/\*value\*/" replace="${map.value}"/>
             <replaceregex pattern="/\*null\*/0/\*null\*/" replace="${map.null}"/>
         </filterchain>