Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
fe711190
Commit
fe711190
authored
Jul 20, 2004
by
Russ Fish
Browse files
Put the win32 source files in a subdirectory.
parent
5d97d8b3
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
hyperviewer/GNUMakefile
View file @
fe711190
...
...
@@ -25,7 +25,7 @@ LDLIBS = ${HVLIB} ${STATIC} -L/usr/X11R6/lib -lGLU -lGL -lXmu -lXext -lX11 -lm
# Distribute the Python scripts, sources, shared library, sample input files, and user doc.
PYFILES
=
hypview.py exptToHv.py sshxmlrpc.py emulabclient.py hvFrameUI.py hv.py hv_win32.py
SRCFILES
=
README ROADMAP GNUMakefile hvgui.wxg hvmain.cpp hv.i hv.mod
_hv.cpp _hv_
win32
.cpp
SRCFILES
=
README ROADMAP GNUMakefile hvgui.wxg hvmain.cpp hv.i hv.mod win32
BINFILES
=
_hv.so
DATAFILES
=
BigLan.hyp ts600.hyp
SCRIPTFILES
=
hypview pangorc.local pango.modules.local
...
...
@@ -45,15 +45,13 @@ hv.i: hv.mod ${HVINC}/HypView.h
# Create the wrappers using SWIG.
hvmain.o
:
hvmain.cpp
g++
-fpic
-c
${CFLAGS}
${INCDIRS}
hvmain.cpp
_hv.cpp hv.py
:
hv.i
_hv.cpp hv.py win32/_hv.cpp win32/hv.py
:
hv.i
# Maintain the WIN32 version of the SWIG generated files in parallel.
swig
-c
++
-python
-DWIN32
-module
hv
-o
win32/_hv.cpp hv.i
# The .py file is named by the -module argument, move it after generation.
mv
hv.py win32
# Now the non-WIN32 version.
swig
-c
++
-python
-DHYPGLUT
-DHYPFREE
-module
hv
-o
_hv.cpp hv.i
# Kluge to maintain the WIN32 version in parallel...
_hv_win32.cpp hv_win32.py
:
hv.i
mv
-f
hv.py hv.py.save
# The .py file is named by the -module argument...
swig
-c
++
-python
-DWIN32
-module
hv
-o
_hv_win32.cpp hv.i
mv
hv.py hv_win32.py
mv
-f
hv.py.save hv.py
# Put the wrappers in a shared library for import by hv.py .
_hv.o
:
_hv.cpp
...
...
hyperviewer/_hv.cpp
View file @
fe711190
...
...
@@ -724,6 +724,15 @@ static swig_type_info *swig_types[8];
// Copyright (c) 2004 University of Utah and the Flux Group.
// All rights reserved.
//
// Permission to use, copy, modify and distribute this software is hereby
// granted provided that (1) source code retains these copyright, permission,
// and disclaimer notices, and (2) redistributions including binaries
// reproduce the notices in supporting documentation.
//
// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
//
#include
<string>
NAMESPACEHACK
...
...
hyperviewer/hv.i
View file @
fe711190
...
...
@@ -5,6 +5,15 @@
// Copyright (c) 2004 University of Utah and the Flux Group.
// All rights reserved.
//
// Permission to use, copy, modify and distribute this software is hereby
// granted provided that (1) source code retains these copyright, permission,
// and disclaimer notices, and (2) redistributions including binaries
// reproduce the notices in supporting documentation.
//
// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
//
#
include
<
string
>
NAMESPACEHACK
...
...
hyperviewer/
_hv_
win32.cpp
→
hyperviewer/win32
/_hv
.cpp
View file @
fe711190
...
...
@@ -727,6 +727,15 @@ static swig_type_info *swig_types[11];
// Copyright (c) 2004 University of Utah and the Flux Group.
// All rights reserved.
//
// Permission to use, copy, modify and distribute this software is hereby
// granted provided that (1) source code retains these copyright, permission,
// and disclaimer notices, and (2) redistributions including binaries
// reproduce the notices in supporting documentation.
//
// THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
// CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
// FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
//
#include
<string>
NAMESPACEHACK
...
...
hyperviewer/
hv_
win32.py
→
hyperviewer/win32
/hv
.py
View file @
fe711190
...
...
@@ -47,7 +47,6 @@ class HypView(_object):
_swig_setattr
(
self
,
HypView
,
'this'
,
_hv
.
new_HypView
(
*
args
))
_swig_setattr
(
self
,
HypView
,
'thisown'
,
1
)
def
afterRealize
(
*
args
):
return
_hv
.
HypView_afterRealize
(
*
args
)
def
getWidget
(
*
args
):
return
_hv
.
HypView_getWidget
(
*
args
)
def
__del__
(
self
,
destroy
=
_hv
.
delete_HypView
):
try
:
if
self
.
thisown
:
destroy
(
self
)
...
...
@@ -90,7 +89,6 @@ class HypView(_object):
def
bindCallback
(
*
args
):
return
_hv
.
HypView_bindCallback
(
*
args
)
def
drawFrame
(
*
args
):
return
_hv
.
HypView_drawFrame
(
*
args
)
def
idle
(
*
args
):
return
_hv
.
HypView_idle
(
*
args
)
def
idleCB
(
*
args
):
return
_hv
.
HypView_idleCB
(
*
args
)
def
motion
(
*
args
):
return
_hv
.
HypView_motion
(
*
args
)
def
mouse
(
*
args
):
return
_hv
.
HypView_mouse
(
*
args
)
def
passive
(
*
args
):
return
_hv
.
HypView_passive
(
*
args
)
...
...
hyperviewer/win32/sets.py
0 → 100755
View file @
fe711190
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment