Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
f4grx
NuttX RTOS
Commits
e505df2e
Commit
e505df2e
authored
7 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
tools/configure.c: Duplicate new functionaity added to configure.sh.
parent
10eed5de
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/configure.c
+41
-12
41 additions, 12 deletions
tools/configure.c
tools/configure.sh
+3
-3
3 additions, 3 deletions
tools/configure.sh
with
44 additions
and
15 deletions
tools/configure.c
+
41
−
12
View file @
e505df2e
...
@@ -99,6 +99,7 @@ static char *g_srcdefconfig = NULL; /* Source defconfig file */
...
@@ -99,6 +99,7 @@ static char *g_srcdefconfig = NULL; /* Source defconfig file */
static
char
*
g_srcmakedefs
=
NULL
;
/* Source Make.defs file */
static
char
*
g_srcmakedefs
=
NULL
;
/* Source Make.defs file */
static
bool
g_winnative
=
false
;
/* True: Windows native configuration */
static
bool
g_winnative
=
false
;
/* True: Windows native configuration */
static
bool
g_oldnative
=
false
;
/* True: Was Windows native configuration */
static
bool
g_needapppath
=
true
;
/* Need to add app path to the .config file */
static
bool
g_needapppath
=
true
;
/* Need to add app path to the .config file */
static
uint8_t
g_host
=
HOST_NOCHANGE
;
static
uint8_t
g_host
=
HOST_NOCHANGE
;
...
@@ -652,24 +653,35 @@ static void check_appdir(void)
...
@@ -652,24 +653,35 @@ static void check_appdir(void)
if
(
!
g_appdir
)
if
(
!
g_appdir
)
{
{
/* No, was the path provided in the configuration? */
/* If no application directory was provided on the command line and we
* are switching between a windows native host and some other host then
* ignore any path to the apps/ directory in the defconfig file. It
* will most certainly not be in a usable form.
*/
struct
variable_s
*
var
=
find_variable
(
"CONFIG_APP_DIR"
,
g_configvars
);
if
(
g_winnative
==
g_oldnative
)
if
(
var
)
{
{
debug
(
"check_appdir: Config file appdir=%s
\n
"
,
/* No, was the path provided in the configuration? */
var
->
val
?
var
->
val
:
"<null>"
);
/* Yes.. does this directory exist? */
struct
variable_s
*
var
=
find_variable
(
"CONFIG_APPS_DIR"
,
g_configvars
);
if
(
var
->
val
&&
verify_appdir
(
var
->
val
)
)
if
(
var
!=
NULL
)
{
{
/* We are using the CONFIG_APP_DIR setting already
debug
(
"check_appdir: Config file appdir=%s
\n
"
,
* in the defconfig file.
var
->
val
?
var
->
val
:
"<null>"
);
*/
g_needapppath
=
false
;
/* Yes.. does this directory exist? */
return
;
if
(
var
->
val
&&
verify_appdir
(
var
->
val
))
{
/* We are using the CONFIG_APPS_DIR setting already in the
* defconfig file.
*/
g_needapppath
=
false
;
return
;
}
}
}
}
}
...
@@ -718,6 +730,23 @@ static void check_configuration(void)
...
@@ -718,6 +730,23 @@ static void check_configuration(void)
if
(
var
&&
var
->
val
&&
strcmp
(
"y"
,
var
->
val
)
==
0
)
if
(
var
&&
var
->
val
&&
strcmp
(
"y"
,
var
->
val
)
==
0
)
{
{
debug
(
"check_configuration: Windows native configuration
\n
"
);
debug
(
"check_configuration: Windows native configuration
\n
"
);
g_oldnative
=
true
;
}
/* If we are going to some host other then windows native or to a windows
* native host, then don't ignore what is in the defconfig file.
*/
if
(
g_host
==
HOST_NOCHANGE
)
{
/* Use whatever we found in the configuration file */
g_winnative
=
g_oldnative
;
}
else
if
(
g_host
==
HOST_WINDOWS
&&
g_windows
==
WINDOWS_NATIVE
)
{
/* The new configuration is windows native */
g_winnative
=
true
;
g_winnative
=
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
tools/configure.sh
+
3
−
3
View file @
e505df2e
...
@@ -183,10 +183,10 @@ else
...
@@ -183,10 +183,10 @@ else
fi
fi
fi
fi
# If no
t
application direct
ion
was
specifi
ed on the command line and we are
# If no application direct
ory
was
provid
ed on the command line and we are
# switching between a windows native host and some other host then ignore the
# switching between a windows native host and some other host then ignore the
# path to the apps/ direct
ion
in the defconfig file. It will most certainly
# path to the apps/ direct
ory
in the defconfig file. It will most certainly
# not be a usable form
a
.
# not be
in
a usable form.
defappdir
=
y
defappdir
=
y
if
[
-z
"
${
appdir
}
"
-a
"X
$oldnative
"
=
"
$winnative
"
]
;
then
if
[
-z
"
${
appdir
}
"
-a
"X
$oldnative
"
=
"
$winnative
"
]
;
then
...
...
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