Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
clean-and-itasks
clean-ide
Commits
60f7e7f1
Commit
60f7e7f1
authored
Oct 14, 2010
by
John van Groningen
Browse files
remove application path, project path and list of object files from project files
parent
5773b9c3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Pm/PmDriver.icl
View file @
60f7e7f1
...
...
@@ -982,12 +982,9 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
//*/
#
static_info
=
{
stat_mods
=
modpaths
,
stat_objs
=
ofiles
,
stat_slibs
=
sfiles
,
stat_dlibs
=
lfiles
,
stat_paths
=
srcpaths
,
stat_app_path
=
app_path
,
stat_prj_path
=
prj_path`
}
#
project
=
setStaticInfo
static_info
project
#
(_,
ps
)
=
accFiles
(
SaveProjectFile
prj_path
project
app_path
)
ps
...
...
Pm/PmFiles.dcl
View file @
60f7e7f1
...
...
@@ -39,12 +39,9 @@ ProjectFileVersion :== "1.4"
::
ProjectStaticInfo
=
{
stat_mods
::
!
List
Pathname
,
stat_objs
::
!
List
Pathname
,
stat_slibs
::
!
List
Pathname
,
stat_dlibs
::
!
List
Pathname
,
stat_paths
::
!
List
Pathname
,
stat_app_path
::
!
Pathname
,
stat_prj_path
::
!
Pathname
}
::
ProjectDynamicInfo
=
...
...
Pm/PmFiles.icl
View file @
60f7e7f1
...
...
@@ -32,23 +32,17 @@ ProjectFileVersion :== "1.4"
::
ProjectStaticInfo
=
{
stat_mods
::
!
List
Pathname
,
stat_objs
::
!
List
Pathname
,
stat_slibs
::
!
List
Pathname
,
stat_dlibs
::
!
List
Pathname
,
stat_paths
::
!
List
Pathname
,
stat_app_path
::
!
Pathname
,
stat_prj_path
::
!
Pathname
}
EmptyStaticInfo
::
ProjectStaticInfo
EmptyStaticInfo
=
{
stat_mods
=
Nil
,
stat_objs
=
Nil
,
stat_slibs
=
Nil
,
stat_dlibs
=
Nil
,
stat_paths
=
Nil
,
stat_app_path
=
""
,
stat_prj_path
=
""
}
::
ProjectDynamicInfo
=
...
...
@@ -319,12 +313,9 @@ getWindowPosAndSize NoWindowPosAndSize = DefWindowPos_and_Size
StaticInfoTable
=
{
ListOption
"Mods"
PathName
""
(\
a
->
a
.
stat_mods
)
(\
v
a
->{
a
&
stat_mods
=
v
})
,
ListOption
"Objs"
PathName
""
(\
a
->
a
.
stat_objs
)
(\
v
a
->{
a
&
stat_objs
=
v
})
,
ListOption
"Slib"
PathName
""
(\
a
->
a
.
stat_slibs
)
(\
v
a
->{
a
&
stat_slibs
=
v
})
,
ListOption
"Dlib"
PathName
""
(\
a
->
a
.
stat_dlibs
)
(\
v
a
->{
a
&
stat_dlibs
=
v
})
,
ListOption
"Pths"
PathName
""
(\
a
->
a
.
stat_paths
)
(\
v
a
->{
a
&
stat_paths
=
v
})
,
SimpleOption
"AppP"
(\
a
->
a
.
stat_app_path
)
(\
v
a
->{
a
&
stat_app_path
=
v
})
,
SimpleOption
"PrjP"
(\
a
->
a
.
stat_prj_path
)
(\
v
a
->{
a
&
stat_prj_path
=
v
})
}
DynamicInfoTable
=
...
...
Pm/PmProject.icl
View file @
60f7e7f1
...
...
@@ -614,10 +614,9 @@ where
addModules
({
name
,
info
}
:!
t
)
project
=
addModules
t
(
PR_AddModule
name
(
ExpandModuleInfoPaths
applicationDir
projectDir
info
)
project
)
FixStatic
ap
pp
si
=:{
stat_mods
,
stat_
objs
,
stat_
slibs
,
stat_dlibs
,
stat_paths
}
=
FixStatic
ap
pp
si
=:{
stat_mods
,
stat_slibs
,
stat_dlibs
,
stat_paths
}
=
{
si
&
stat_mods
=
ExpandPaths
ap
pp
stat_mods
,
stat_objs
=
ExpandPaths
ap
pp
stat_objs
,
stat_slibs
=
ExpandPaths
ap
pp
stat_slibs
,
stat_dlibs
=
ExpandPaths
ap
pp
stat_dlibs
,
stat_paths
=
ExpandPaths
ap
pp
stat_paths
...
...
@@ -662,9 +661,8 @@ where
staticLibInfo
=
SubstituteStaticLibPaths
applicationDir
projectDir
(
PR_GetStaticLibsInfo
project
)
target
=
PR_GetTarget
project
substitite_paths_in_static
ap
pp
si
=:{
stat_mods
,
stat_
objs
,
stat_
slibs
,
stat_dlibs
,
stat_paths
}
substitite_paths_in_static
ap
pp
si
=:{
stat_mods
,
stat_slibs
,
stat_dlibs
,
stat_paths
}
=
{
si
&
stat_mods
=
SubstitutePaths
ap
pp
stat_mods
,
stat_objs
=
SubstitutePaths
ap
pp
stat_objs
,
stat_slibs
=
SubstitutePaths
ap
pp
stat_slibs
,
stat_dlibs
=
SubstitutePaths
ap
pp
stat_dlibs
,
stat_paths
=
SubstitutePaths
ap
pp
stat_paths
...
...
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