jdk-sandbox: comparison make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java

equal deleted inserted replaced

-:8b7430e0a67a
+:657780f239c4
 /*
-* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 e.printStackTrace();
 }
 }
 public void writeJavaWrapperClass(String outputDir) {
-//          (new File(outputDir, package_path)).mkdirs();
 try {
 for (Enumeration e = symbolTable.elements() ; e.hasMoreElements() ;) {
 BaseType tp = (BaseType) e.nextElement();
 if (tp instanceof StructType) {
 StructType st = (StructType) tp;
 catch (Exception e) {
 e.printStackTrace();
 }
 }
 public void writeNativeSizer(String file)
 {
 int type;
 int i=0;
 int j=0;
 BaseType tp;
 StructType stp;
 Enumeration eo;
 try {
 FileOutputStream fs =  new FileOutputStream(file);
 PrintWriter pw = new PrintWriter(fs);
 pw.println("    unsigned long decorations;\n");
 pw.println("    long inputMode;\n");
 pw.println("    unsigned long status;\n");
 pw.println("} PropMwmHints;\n");
 pw.println("\n\nint main(){");
 j=0;
 for ( eo = symbolTable.elements() ; eo.hasMoreElements() ;) {
 tp = (BaseType) eo.nextElement();
 if (tp instanceof StructType)
 pw.println("printf(\"short\t%d\\n\",(int)sizeof(short));");
 pw.println("printf(\"ptr\t%d\\n\",(int)sizeof(void *));");
 pw.println("printf(\"Bool\t%d\\n\",(int)sizeof(Bool));");
 pw.println("printf(\"Atom\t%d\\n\",(int)sizeof(Atom));");
 pw.println("printf(\"Window\t%d\\n\",(int)sizeof(Window));");
 for (eo = symbolTable.elements() ; eo.hasMoreElements() ;) {
 tp = (BaseType) eo.nextElement();
 symbolTable.put("pointer", new AtomicType(AtomicType.TYPE_PTR, "", "pointer"));
 symbolTable.put("longlong", new AtomicType(AtomicType.TYPE_LONG_LONG, "", "longlong"));
 symbolTable.put("Atom", new AtomicType(AtomicType.TYPE_ATOM, "", "Atom"));
 symbolTable.put("ulong", new AtomicType(AtomicType.TYPE_ULONG, "", "ulong"));
 }
-public WrapperGenerator(String outputDir, String xlibFilename) {
+public WrapperGenerator(String xlibFilename) {
 initTypes();
 try {
 BufferedReader in  = new BufferedReader(new FileReader(xlibFilename));
 String line;
 String splits[];
 in.close();
 }
 catch (Exception e) {
 e.printStackTrace();
 }
+}
-}
-private void makeSizer(String outputDir) {
+private void makeSizer(String sizerFileName) {
-if (wide) {
+File fp = new File(sizerFileName);
-sizerFileName = "sizer.64.c";
-} else {
-sizerFileName = "sizer.32.c";
-}
-File fp = new File(outputDir, sizerFileName);
 writeNativeSizer(fp.getAbsolutePath());
 }
-private boolean readSizeInfo(String sizeInfo) {
+private boolean readSizeInfo(String file32, String file64) {
 try {
-File f = new File(sizeInfo+".32");
 boolean res = true;
-FileInputStream fis = null;
+if (!file32.equals("IGNORE")) {
-if (f.exists()) {
+FileInputStream fis = new FileInputStream(file32);
-fis = new FileInputStream(f);
 res = readSizeInfo(fis, false);
 fis.close();
 }
-f = new File(sizeInfo+".64");
+if (!file64.equals("IGNORE")) {
-if (f.exists()) {
+FileInputStream fis = new FileInputStream(file64);
-fis = new FileInputStream(f);
 res &= readSizeInfo(fis, true);
 fis.close();
 }
 return res;
 } catch (Exception e) {
 e.printStackTrace();
 return false;
 }
 }
-private void startGeneration(String outputDir, String sizeInfo) {
+private void startGeneration(String outputDir, String file32, String file64) {
-if (readSizeInfo(sizeInfo))
+if (readSizeInfo(file32, file64))
 {
 writeJavaWrapperClass(outputDir);
 }
 else {
 System.out.println("Error calculating offsets");
 }
 public static void main(String[] args) {
 if (args.length < 4) {
-System.out.println("Usage:\nWrapperGenerator <output_dir> <xlibtypes.txt> <action> [<platform> | <sizes info file>]");
+System.out.println("Usage:\nWrapperGenerator gen_java <output_dir> <xlibtypes.txt> <sizes-32.txt|IGNORE> <sizes-64.txt|IGNORE>");
-System.out.println("Where <action>: gen, sizer");
+System.out.println("      or");
-System.out.println("      <platform>: 32, 64");
+System.out.println("WrapperGenerator gen_c_source <output_file> <xlibtypes.txt> <platform>");
+System.out.println("Where <platform>: 32, 64");
 System.exit(1);
 }
-WrapperGenerator xparser = new WrapperGenerator(args[0], args[1]);
+WrapperGenerator xparser = new WrapperGenerator(args[2]);
-if (args[2].equals("sizer")) {
+if (args[0].equals("gen_c_source")) {
 xparser.wide = args[3].equals("64");
-xparser.makeSizer(args[0]);
+xparser.makeSizer(args[1]);
-} else if (args[2].equals("gen")) {
+} else if (args[0].equals("gen_java")) {
-xparser.startGeneration(args[0], args[3]);
+xparser.startGeneration(args[1], args[3], args[4]);
 }
 }
 }

branch	ihse-cflags-rewrite-branch
changeset 56211	657780f239c4
parent 47216	71c04702a3d5
child 56312	a52bcf4118eb