toolset progress
This commit is contained in:
rusefi 2020-08-14 16:20:10 -04:00
parent 8bcc3aeb64
commit ea052ed2b2
5 changed files with 14 additions and 9 deletions

View File

@ -15,7 +15,7 @@
debug="true" debug="true"
target="${javac.target}" target="${javac.target}"
destdir="build/classes" destdir="build/classes"
classpath="../../java_console/lib/jsr305-2.0.1.jar:lib/junit.jar:../../java_console/lib/annotations.jar:lib/snakeyaml.jar"> classpath="${console_path}/lib/jsr305-2.0.1.jar:lib/junit.jar:../../java_console/lib/annotations.jar:lib/snakeyaml.jar">
<src path="src"/> <src path="src"/>
<src path="${console_path}/autoupdate/src"/> <src path="${console_path}/autoupdate/src"/>
<src path="${console_path}/inifile/src"/> <src path="${console_path}/inifile/src"/>

Binary file not shown.

View File

@ -3,7 +3,8 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/enum_to_string.iml" filepath="$PROJECT_DIR$/enum_to_string.iml" /> <module fileurl="file://$PROJECT_DIR$/enum_to_string.iml" filepath="$PROJECT_DIR$/enum_to_string.iml" />
<module fileurl="file://$PROJECT_DIR$/../../java_console/logging/logging.iml" filepath="$PROJECT_DIR$/../../java_console/logging/logging.iml" />
<module fileurl="file://$PROJECT_DIR$/../../java_console/logging-api/logging-api.iml" filepath="$PROJECT_DIR$/../../java_console/logging-api/logging-api.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View File

@ -1,14 +1,18 @@
<project default="jar"> <project default="jar">
<property name="console_path" value="../../java_console"/>
<target name="clean"> <target name="clean">
<delete dir="build"/> <delete dir="build"/>
</target> </target>
<target name="compile"> <target name="compile">
<mkdir dir="build/classes"/> <mkdir dir="build/classes"/>
<javac destdir="build/classes" classpath="../../java_console/lib/junit.jar:lib/annotations.jar"> <javac destdir="build/classes" classpath="${console_path}/lib/jsr305-2.0.1.jar:${console_path}/lib/junit.jar:${console_path}/lib/annotations.jar">
<src path="src"/> <src path="src"/>
</javac> <src path="${console_path}/logging-api/src/main/java"/>
<src path="${console_path}/logging/src"/>
</javac>
</target> </target>
<target name="jar" depends="compile"> <target name="jar" depends="compile">
@ -17,7 +21,7 @@
<manifest> <manifest>
<attribute name="Main-Class" value="com.rusefi.EnumToString"/> <attribute name="Main-Class" value="com.rusefi.EnumToString"/>
</manifest> </manifest>
<zipfileset dir="build/classes" includes="**/*.class"/> <zipfileset dir="build/classes" includes="**/*.class"/>
</jar> </jar>
</target> </target>

View File

@ -45,14 +45,13 @@ public class EnumToString {
for (int i = 0; i < args.length - 1; i += 2) { for (int i = 0; i < args.length - 1; i += 2) {
String key = args[i]; String key = args[i];
if (key.equals(KEY_INPUT_PATH)) { if (key.equals(KEY_INPUT_PATH)) {
inputPath = args[i + 1]; inputPath = Objects.requireNonNull(args[i + 1], KEY_INPUT_PATH);
} else if (key.equals(KEY_ENUM_INPUT_FILE)) { } else if (key.equals(KEY_ENUM_INPUT_FILE)) {
String headerInputFile = args[i + 1]; String headerInputFile = args[i + 1];
consumeFile(enumsReader, inputPath, headerInputFile); consumeFile(enumsReader, inputPath, headerInputFile);
} else if (key.equals(KEY_OUTPUT)) { } else if (key.equals(KEY_OUTPUT)) {
outputPath = args[i + 1]; outputPath = args[i + 1];
} }
} }
headerFileContent.append("#pragma once\n"); headerFileContent.append("#pragma once\n");
@ -85,6 +84,7 @@ public class EnumToString {
} }
private static void consumeFile(EnumsReader enumsReader, String inputPath, String headerInputFileName) throws IOException { private static void consumeFile(EnumsReader enumsReader, String inputPath, String headerInputFileName) throws IOException {
Objects.requireNonNull(inputPath, "inputPath");
File f = new File(inputPath + File.separator + headerInputFileName); File f = new File(inputPath + File.separator + headerInputFileName);
SystemOut.println("Reading enums from " + headerInputFileName); SystemOut.println("Reading enums from " + headerInputFileName);
String simpleFileName = f.getName(); String simpleFileName = f.getName();