better custom rules

This commit is contained in:
Ken Martin
2001-05-04 09:39:05 -04:00
parent faaadc4a08
commit 4d9b2f59cc
5 changed files with 76 additions and 48 deletions

View File

@@ -103,13 +103,14 @@ void cmVTKWrapJavaCommand::FinalPass()
// first we add the rules for all the .h to Java.cxx files
int lastClass = m_WrapClasses.size();
std::vector<std::string> depends;
std::vector<std::string> depends2;
std::string wjava = "${VTK_WRAP_JAVA_EXE}";
std::string pjava = "${VTK_PARSE_JAVA_EXE}";
std::string hints = "${VTK_WRAP_HINTS}";
// wrap all the .h files
depends.push_back(wjava);
depends.push_back(pjava);
depends2.push_back(pjava);
for(int classNum = 0; classNum < lastClass; classNum++)
{
m_Makefile->AddSource(m_WrapClasses[classNum],m_SourceList.c_str());
@@ -117,17 +118,18 @@ void cmVTKWrapJavaCommand::FinalPass()
// wrap java
std::string res = m_WrapClasses[classNum].GetSourceName() + ".cxx";
std::string res2 = m_OriginalNames[classNum] + ".java";
std::vector<std::string> resvec;
resvec.push_back(res);
resvec.push_back(res2);
std::string cmd = wjava + " " + m_WrapHeaders[classNum] + " "
+ hints + (m_WrapClasses[classNum].IsAnAbstractClass() ? " 0 " : " 1 ") + " > " + m_WrapClasses[classNum].GetSourceName() + ".cxx\\\n\t" +
pjava + " " + m_WrapHeaders[classNum] + " "
+ hints + (m_WrapClasses[classNum].IsAnAbstractClass() ? " 0 " : " 1 ") + " > " + m_OriginalNames[classNum] + ".java";
+ hints + (m_WrapClasses[classNum].IsAnAbstractClass() ? " 0 " : " 1 ") + " > " + m_WrapClasses[classNum].GetSourceName() + ".cxx";
m_Makefile->AddCustomCommand(m_WrapHeaders[classNum].c_str(),
cmd.c_str(), depends,
resvec, m_LibraryName.c_str());
res.c_str(), m_LibraryName.c_str());
cmd = pjava + " " + m_WrapHeaders[classNum] + " "
+ hints + (m_WrapClasses[classNum].IsAnAbstractClass() ? " 0 " : " 1 ") + " > " + m_OriginalNames[classNum] + ".java";
m_Makefile->AddCustomCommand(m_WrapHeaders[classNum].c_str(),
cmd.c_str(), depends2,
res2.c_str(), m_LibraryName.c_str());
}
}