Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Controllar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MINT
Controllar
Commits
b51b934b
"...scodoc_r6a06.git" did not exist on "f045d2ca0d711a90fe9eac5da115d90f8ab7a99b"
Commit
b51b934b
authored
7 years ago
by
Florent Berthaut
Browse files
Options
Downloads
Patches
Plain Diff
Fixed installation with wscript
parent
a2cffedf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
wscript
+4
-4
4 additions, 4 deletions
wscript
with
4 additions
and
4 deletions
wscript
+
4
−
4
View file @
b51b934b
...
@@ -48,7 +48,6 @@ def configure(conf):
...
@@ -48,7 +48,6 @@ def configure(conf):
conf
.
env
.
DEFINES
=
[
'
DEBUG(x)=std::cout<< x <<std::endl;
'
]
conf
.
env
.
DEFINES
=
[
'
DEBUG(x)=std::cout<< x <<std::endl;
'
]
def
build
(
bld
):
def
build
(
bld
):
installPath
=
'
/usr/local/bin
'
macApp
=
False
macApp
=
False
if
sys
.
platform
==
'
darwin
'
:
if
sys
.
platform
==
'
darwin
'
:
...
@@ -77,14 +76,15 @@ def build(bld):
...
@@ -77,14 +76,15 @@ def build(bld):
use
=
[
'
OS
'
,
'
GL
'
,
'
winsman
'
,
'
oscpack
'
],
use
=
[
'
OS
'
,
'
GL
'
,
'
winsman
'
,
'
oscpack
'
],
target
=
'
controllar
'
+
bld
.
variant
,
target
=
'
controllar
'
+
bld
.
variant
,
vnum
=
'
0.0.1
'
,
vnum
=
'
0.0.1
'
,
install_path
=
installPath
,
mac_app
=
macApp
,
mac_app
=
macApp
,
mac_plist
=
'
data/Info.plist
'
,
mac_plist
=
'
data/Info.plist
'
,
mac_resources
=
'
data/controllar.icns
'
,
mac_resources
=
'
data/controllar.icns
'
,
)
)
def
install
(
bld
):
bld
.
install_files
(
'
${PREFIX}/share/applications
'
,
bld
.
install
(
'
${PREFIX}/bin
'
,
'
controllar
'
)
[
'
data/controllar.desktop
'
])
bld
.
install_files
(
'
${PREFIX}/share/icons
'
,
[
'
data/controllar.png
'
])
from
waflib.Build
import
BuildContext
,
CleanContext
from
waflib.Build
import
BuildContext
,
CleanContext
class
debug
(
BuildContext
):
class
debug
(
BuildContext
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment