Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

redundant makefiles #404

Merged
merged 2 commits into from
Feb 6, 2013
Merged

redundant makefiles #404

merged 2 commits into from
Feb 6, 2013

Conversation

MartinNowak
Copy link
Member

factor out MANIFEST, SRCS, DOCS, IMPORTS and COPY

digitalmars make doesn't allow to declare all of those variables in one file

@alexrp
Copy link
Member

alexrp commented Feb 6, 2013

Why the POSIX_SRCS and WIN_SRCS stuff? All files need to be built on all platforms; only version statements should be used to do conditional compilation.

@MartinNowak
Copy link
Member Author

Why the POSIX_SRCS and WIN_SRCS stuff?

The difference was already there but as it doesn't really save compilation time I'll merge them.

@alexrp
Copy link
Member

alexrp commented Feb 6, 2013

Hm, I thought we'd gotten rid of all the conditional compilation in the makefiles. Oh well.

Everything else looks reasonable, so just waiting on the auto tester.

- mak/posix.mak for simple GNU make include
- linux/epoll.d, linux/sys/signalfd.d, posix/sys/ioctl.d, posix/sys/statvfs.d
@MartinNowak
Copy link
Member Author

It's green now.

@alexrp
Copy link
Member

alexrp commented Feb 6, 2013

Oh, just noticed this:

digitalmars make doesn't allow to declare all of those variables in one file

What the hell?

Anyway, LGTM so merging.

alexrp added a commit that referenced this pull request Feb 6, 2013
@alexrp alexrp merged commit 5ebedb0 into dlang:master Feb 6, 2013
@MartinNowak
Copy link
Member Author

digitalmars make doesn't allow to declare all of those variables in one file
What the hell?

It's more of a macro mechanism that loads the content of a file rather than a real make include.

@MartinNowak MartinNowak deleted the redundantMakefiles branch February 6, 2013 20:40
@WalterBright
Copy link
Member

Why is there MANIFEST and mak\MANIFEST, with the same contents?

@alexrp
Copy link
Member

alexrp commented Feb 7, 2013

MANIFEST is a leftover methinks.

@WalterBright
Copy link
Member

Well, they're not quite the same. What's going on?

C:\cbx\mars\druntime>diff manifest mak\manifest
65,66c63,65
< src\core\sys\linux\execinfo.d \

< src\core\sys\linux\epoll.d \

  src\core\sys\linux\elf.d \
  src\core\sys\linux\epoll.d \
  src\core\sys\linux\execinfo.d \

@WalterBright
Copy link
Member

Oh joy, the github markup language barfed all over my post again.

@WalterBright
Copy link
Member

This pull is a blocker for me. It's pretty much completely borked up my build/test scripts.

@andralex
Copy link
Member

andralex commented Feb 8, 2013

Use the script I sent you to unpull.

@WalterBright
Copy link
Member

ok:

mercury ~/dpl/druntime> ~/cbx/mars/unpull 5ebedb0
The merge target dfbb597' doesn't match the pre-merge commit307fa4e'.

Take a look at the output of `git log':

commit 8299db2
Merge: 307fa4e dfbb597
Author: Alex Rønne Petersen alex@alexrp.com
Date: Wed Feb 6 15:00:51 2013 -0800

Merge pull request #402 from dawgfoto/GNULinuxElfHeader

port core.sys.linux.elf

commit 307fa4e

@WalterBright
Copy link
Member

ok:
mercury ~/dpl/druntime> ~/cbx/mars/unpull 5ebedb0
The merge target dfbb597' doesn't match the pre-merge commit307fa4e'.
Take a look at the output of `git log':
============
commit 8299db2
Merge: 307fa4e dfbb597
Author: Alex Rønne Petersen alex@alexrp.com
Date: Wed Feb 6 15:00:51 2013 -0800

    Merge pull request #402 from dawgfoto/GNULinuxElfHeader

    port core.sys.linux.elf

commit 307fa4efd4dd02fde5c25be4d03d7e7cf81504fa
============

@WalterBright
Copy link
Member

Well, I can't seem to get the goddammed github markup to stop fscking it up.

@alexrp
Copy link
Member

alexrp commented Feb 8, 2013

Indent arbitrary text with 4 spaces and it'll turn

into this

@ghost
Copy link

ghost commented Feb 8, 2013

Wrap text in three backticks (three to begin and three to end) and you'll get:

non-formatted text here

WalterBright added a commit to WalterBright/druntime that referenced this pull request Feb 8, 2013
andralex added a commit that referenced this pull request Feb 8, 2013
@WalterBright
Copy link
Member

What the scripts depend on is the zip file including all of the files under git control, so they can be easily transferred from system to system and to the release directory structure.

@MartinNowak
Copy link
Member Author

All this completely broke:

make -f posix.mak zip

Sorry, I forgot to update the MANIFEST accordingly.

Why is there MANIFEST and mak\MANIFEST, with the same contents?

It was deleted in the new branch. I have no idea why you still had a local copy.

What the scripts depend on is the zip file including all of the files under git control, so they can be easily transferred from system to system and to the release directory structure.

Why don't we autogenerate the MANIFEST then.
git ls-tree -r HEAD would list all files.

@MartinNowak
Copy link
Member Author

I've redone the pull #408.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
4 participants