View Issue Details

IDProjectCategoryView StatusLast Update
0008290ScribusBuild Systempublic2009-07-27 21:01
Reportersharkcz Assigned Tocbradney  
PrioritynormalSeveritymajorReproducibilityalways
Status closedResolutionfixed 
Product Version1.3.5svn 
Target Version1.3.5Fixed in Version1.3.5svn 
Summary0008290: multiple copies of color.h exists
Description3 copies of color.h exist in the sources, but only the primary one (scribus/color.h) was updated last time

[dan@eagle scribus]$ find . -name color.h | xargs ls -al
-rw-rw-r-- 1 dan dan 8581 29. dub 17.59 ./Scribus/scribus/color.h
-rw-rw-r-- 1 dan dan 8523 29. dub 17.59 ./Scribus/scribus/plugins/fileloader/oodraw/color.h
-rw-rw-r-- 1 dan dan 8523 29. dub 17.59 ./Scribus/scribus/plugins/svgimplugin/color.h

and probably when using parallel builds (make -j4) a random copy is installed as /usr/include/scribus/color.h. Version 1.3.5-rc3 builds fine with the latter two removed.

You can see the different sizes of /usr/include/scribus/color.h in
http://koji.fedoraproject.org/koji/rpminfo?fileStart=50&rpmID=1259275&fileOrder=name#filelist
and
http://koji.fedoraproject.org/koji/rpminfo?fileStart=50&rpmID=1259277&fileOrder=name#filelist
Both binary rpm packages were built from one source rpm, the whole build can be seen at http://koji.fedoraproject.org/koji/buildinfo?buildID=104799
TagsNo tags attached.
Patch

Activities

sharkcz

2009-07-15 11:03

reporter   ~0022186

similar issue exists for contentreader.h and stylereader.h

[dan@eagle scribus]$ find . -name contentreader.h | xargs ls -al
-rw-rw-r-- 1 dan dan 3318 29. dub 17.59 ./Scribus/scribus/plugins/gettext/odtim/contentreader.h
-rw-rw-r-- 1 dan dan 3373 29. dub 17.59 ./Scribus/scribus/plugins/gettext/sxwim/contentreader.h
[dan@eagle scribus]$ find . -name stylereader.h | xargs ls -al
-rw-rw-r-- 1 dan dan 5251 29. dub 17.59 ./Scribus/scribus/plugins/gettext/odtim/stylereader.h
-rw-rw-r-- 1 dan dan 3544 29. dub 17.59 ./Scribus/scribus/plugins/gettext/sxwim/stylereader.h

sharkcz

2009-07-15 11:39

reporter   ~0022190

The main problem is in the last section of scribus/CMakeLists.txt where it copies all found *.h file into /usr/include/scribus without any structure.

sharkcz

2009-07-15 11:52

reporter   ~0022191

complete list of headers with multiple copies in the sources (svn trunk), some of them are identical so they don't represent a consistency problem

color.h
contentreader.h
nftdialog.h
nftrcreader.h
nftsettings.h
nfttemplate.h
resourcecollection.h
style.h
stylereader.h

jghali

2009-07-15 21:48

administrator   ~0022195

I removed the duplicate color.h. Other duplicate are coming from different plugins which have no reason to share that code. Those duplicate are only duplicates for now...

2009-07-21 13:12

 

scribus-1.3.5-install-headers.patch (648 bytes)   
--- scribus-1.3.5.rc3/scribus/CMakeLists.txt.orig	2009-05-17 23:23:08.000000000 +0200
+++ scribus-1.3.5.rc3/scribus/CMakeLists.txt	2009-07-21 15:09:25.000000000 +0200
@@ -834,8 +834,7 @@ ENDIF(APPLEBUNDLE)
 
 #Install our header files, selected from all existing dirs
 IF(NOT WANT_NOHEADERINSTALL)
-  FILE( GLOB_RECURSE SCRIBUS_HEADER_FILES *.h )
-  INSTALL(FILES ${SCRIBUS_HEADER_FILES} DESTINATION ${INCLUDEDIR})
+  INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
 ELSE(NOT WANT_NOHEADERINSTALL)
   MESSAGE(STATUS "No source header files will be installed")
 ENDIF(NOT WANT_NOHEADERINSTALL)

sharkcz

2009-07-21 13:56

reporter   ~0022224

added patch that carries the directory hierarchy when installing the headers into ${INCLUDEDIR}, it creates some empty dirs, but much better then the current flat structure

cbradney

2009-07-27 20:38

administrator   ~0022243

Patch committed with quite a few changes to exclude unnecessary files.

Issue History

Date Modified Username Field Change
2009-07-15 10:58 sharkcz New Issue
2009-07-15 11:03 sharkcz Note Added: 0022186
2009-07-15 11:39 sharkcz Note Added: 0022190
2009-07-15 11:52 sharkcz Note Added: 0022191
2009-07-15 19:12 cbradney Status new => assigned
2009-07-15 19:12 cbradney Assigned To => jghali
2009-07-15 21:20 jghali Assigned To jghali =>
2009-07-15 21:21 jghali Status assigned => new
2009-07-15 21:48 jghali Note Added: 0022195
2009-07-21 13:12 sharkcz File Added: scribus-1.3.5-install-headers.patch
2009-07-21 13:56 sharkcz Note Added: 0022224
2009-07-27 20:38 cbradney Status new => assigned
2009-07-27 20:38 cbradney Assigned To => cbradney
2009-07-27 20:38 cbradney Note Added: 0022243
2009-07-27 20:38 cbradney Status assigned => resolved
2009-07-27 20:38 cbradney Fixed in Version => 1.3.5svn
2009-07-27 20:38 cbradney Resolution open => fixed
2009-07-27 20:44 cbradney Target Version => 1.3.5
2009-07-27 21:01 cbradney Status resolved => closed