Bug 801 – ns-3.7 and SVN not coexisting nicely

Bug 801 - ns-3.7 and SVN not coexisting nicely


Summary:	ns-3.7 and SVN not coexisting nicely

Status:	RESOLVED FIXED

Product:	ns-3
Classification:	Unclassified
Component:	build system
Version:	ns-3.7
Hardware:	All All

Importance:	P5 normal
Assigned To:	ns-bugs

URL:
Keywords:

Depends on:
Blocks:
	Show dependency tree / graph

Reported:	2010-02-01 00:41 EST by Tom Henderson
Modified:	2010-04-16 12:41 EDT (History)
CC List:	2 users (show)

See Also:

Attachments
proposed fix (745 bytes, patch) 2010-02-09 04:54 EST, Andrey Mazo	Details \| Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Tom Henderson 2010-02-01 00:41:05 EST

Reported here: http://mailman.isi.edu/pipermail/ns-developers/2010-January/007365.html

I use SVN to manage my ns-3 repository.  After committing base ns-3.7
to SVN, I get the following when I try to build:

$ ./waf
Waf: Entering directory `/cygdrive/c/users/kevin/ns3.7/build'
 error: Could not read the file
'/cygdrive/c/users/kevin/ns3.7/examples/.svn/wscript'

It's trying to find wscript in my .svn directories.  I had to comment
out the following from the root wscript for the build to go through
for me:

   # if env['ENABLE_EXAMPLES']:
        # bld.add_subdirs('examples')
        #for dir in os.listdir('examples'):
        #    if os.path.isdir(os.path.join('examples', dir)):
        #        bld.add_subdirs(os.path.join('examples', dir))

This did not happen in ns-3.6 as it looks like building the examples
was done differently.

Comment 1 Andrey Mazo 2010-02-09 04:54:15 EST

Created attachment 758 [details]
proposed fix

Omit CVS and .* subdirectories from examples/ listing.

Comment 2 Andrey Mazo 2010-02-09 04:56:49 EST

(In reply to comment #0)
> It's trying to find wscript in my .svn directories.  I had to comment
> out the following from the root wscript for the build to go through
> for me:
> 
>    # if env['ENABLE_EXAMPLES']:
>         # bld.add_subdirs('examples')
>         #for dir in os.listdir('examples'):
>         #    if os.path.isdir(os.path.join('examples', dir)):
>         #        bld.add_subdirs(os.path.join('examples', dir))
Instead of commenting out this block of code, you can just "./waf configure --disable-examples".

Comment 3 Andrey Mazo 2010-02-09 05:00:19 EST

Similar to bug 387 [1].

[1] http://www.nsnam.org/bugzilla/show_bug.cgi?id=387

Comment 4 Josh Pelkey 2010-04-16 12:41:41 EDT

tested proposed fix with latest ns-3-dev and svn.  fixes problem, pushing.

changeset 3f7f94c78f0a