(forw) Re: [Uml-devel] [Bug 60139] New: Missing INSTALL file in CVS

[Sebastian Stein]

Can please someone check this patch, because I'm not an automake guru!

Steinchen

----- Forwarded message from Amilcar do Carmo Lucas <amilcar at ida.ing.tu-bs.de> -----

From: Amilcar do Carmo Lucas <amilcar at ida.ing.tu-bs.de>
Subject: Re: [Uml-devel] [Bug 60139] New: Missing INSTALL file in CVS
Date: Fri, 20 Jun 2003 20:48:26 +0200
To: Sebastian Stein <seb.stein at hpfsc.de>
Reply-To: a.lucas at tu-bs.de

Sebastian Stein wrote:

>>Besides that I did the normal .configure && make && make install in KDESDK
>>root and it worked for kompare, kbugbuster, cervisia and the other tools,
>>but it give an error
>>in umbrello: No target rule to build all
>>   
>>
>
>Have you done:
>
>make -f Makefile.cvs
>sh configure ...
>
>in your kdesdk/ directory?
> 
>
yeap I did, but I gess I used some bad configure parameters or something 
because I retested it and it worked.
So now all is fine but I get some compile errors. I attach the patch to 
solve them.

-- 
Amilcar Lucas

-----------------------------------------------------------------------
            Institut fuer Datentechnik und Kommunikationsnetze
              Technische Universitaet Braunschweig, Germany      

Amilcar do Carmo Lucas                Tel. : +49 531 391 3751
Raum 1315                             Fax  : +49 531 391 3750
Hans-Sommer Str. 66                   Email: amilcar at ida.ing.tu-bs.de
D-38106 Braunschweig
       http://www.ida.ing.tu-bs.de/people/amilcar/home.e.shtml
-----------------------------------------------------------------------



Index: umbrello/umbrello/Makefile.am
===================================================================
RCS file: /home/kde/kdesdk/umbrello/umbrello/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- umbrello/umbrello/Makefile.am	12 May 2003 23:31:57 -0000	1.21
+++ umbrello/umbrello/Makefile.am	20 Jun 2003 18:46:30 -0000
@@ -14,6 +14,7 @@
 appdir=$(kde_datadir)/umbrello
 app_DATA = tips umbrelloui.rc

+xdg_appsdir = $(kde_mimedir)/application
 xdg_apps_DATA = umbrello.desktop

 mimedir = $(kde_mimedir)/application
Index: umbrello/umbrello/codegenerators/cppwriter.cpp
===================================================================
RCS file: /home/kde/kdesdk/umbrello/umbrello/codegenerators/cppwriter.cpp,v
retrieving revision 1.10
diff -u -r1.10 cppwriter.cpp
--- umbrello/umbrello/codegenerators/cppwriter.cpp	18 Jun 2003 19:31:41 -0000	1.10
+++ umbrello/umbrello/codegenerators/cppwriter.cpp	20 Jun 2003 18:46:30 -0000
@@ -1299,7 +1299,7 @@
 // methods like this _shouldnt_ be needed IF we properly did things thruought the code.
 QString CppWriter::getUMLObjectName(UMLObject *obj)
 {
-	return(obj!=0)?obj->getName():"NULL";
+	return(obj!=0)?obj->getName():QString("NULL");
 }

 QString CppWriter::capitalizeFirstLetter(QString string)
Index: umbrello/umbrello/codegenerators/javawriter.cpp
===================================================================
RCS file: /home/kde/kdesdk/umbrello/umbrello/codegenerators/javawriter.cpp,v
retrieving revision 1.12
diff -u -r1.12 javawriter.cpp
--- umbrello/umbrello/codegenerators/javawriter.cpp	16 Jun 2003 08:24:33 -0000	1.12
+++ umbrello/umbrello/codegenerators/javawriter.cpp	20 Jun 2003 18:46:30 -0000
@@ -783,7 +783,7 @@
 // methods like this _shouldnt_ be needed IF we properly did things thruought the code.
 QString JavaWriter::getUMLObjectName(UMLObject *obj)
 {
-	return(obj!=0)?obj->getName():"NULL";
+	return(obj!=0)?obj->getName():QString("NULL");
 }

 QString JavaWriter::capitaliseFirstLetter(QString string)


----- End forwarded message -----

-- 
http://www.hpfsc.de/ - die Seite rund um:
Assembler, Bundeswehr, TFT LCDs, Halle/Saale, Fahrradtouren,
Wanderstaat Mauma, Raumschiff USS Nathan, Enemy Room, MLCAD Tutorial